Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

notifications: Use OS X's pgrep #570

Merged
merged 1 commit into from
Apr 8, 2020
Merged

notifications: Use OS X's pgrep #570

merged 1 commit into from
Apr 8, 2020

Conversation

docwhat
Copy link
Contributor

@docwhat docwhat commented Dec 22, 2017

Always use OS X's BSD pgrep instead of (for example)
the proctools version that is in the PATH earlier.

Always use OS X's  BSD `pgrep` instead of (for example)
the proctools version that is in the `PATH` earlier.
@muffcrusher
Copy link

Try this....From 7ecf952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20H=C3=B6ltje?= docwhat@gerf.org
Date: Fri, 22 Dec 2017 09:49:29 -0500
Subject: [PATCH] notifications: Use OS X's pgrep

Always use OS X's BSD pgrep instead of (for example)
the proctools version that is in the PATH earlier.

lib/travis/tools/system.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/travis/tools/system.rb b/lib/travis/tools/system.rb
index 38b46b9..ba9f3bb 100644
--- a/lib/travis/tools/system.rb
+++ b/lib/travis/tools/system.rb
@@ -81,7 +81,7 @@ def has?(command)

   def running?(app)
     return false unless unix?
  •    system "pgrep -u $(whoami) #{app} >/dev/null"
    
  •    system "/usr/bin/pgrep -u $(whoami) #{app} >/dev/null"
     end
    
    end
    end

@mellery451
Copy link

👍 FWIW, without this change, my system fails to detect the osx notification system (because it uses the wrong pgrep)

@BanzaiMan BanzaiMan merged commit ec5e473 into travis-ci:master Apr 8, 2020
@docwhat docwhat deleted the patch-1 branch April 9, 2020 02:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants