diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-06 15:17:51 -0500 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-06 15:17:51 -0500 |
| commit | dab097d5000c4697761b6985cb3512f7bce0147f (patch) | |
| tree | 7b81b7826a1e23822955560f0f73dc09cda6c8e8 /.local/bin/pick | |
| parent | f50b49ef26f5c692bda1f3f13cd38f9f4f395300 (diff) | |
| parent | a6f973687fb4a1a4558f74f7da595b6902a5dce0 (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
Conflicts:
.config/X11/clientrc
.config/bash/rc.d/emacs.sh
.config/cron/make-config
.config/emacs/custom.el
.config/emacs/init.el
.config/git/config
.config/login.sh
.config/selected_editor
.local/bin/config-path
Diffstat (limited to '.local/bin/pick')
| -rwxr-xr-x | .local/bin/pick | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.local/bin/pick b/.local/bin/pick index ed2d44d..7458041 100755 --- a/.local/bin/pick +++ b/.local/bin/pick @@ -19,8 +19,8 @@ if [[ $1 = -s ]]; then shift # Scan to find a running instance for prog in "$@"; do - if [[ -n "`pgrep $prog`" ]]; then - printf '%s\n' "$prog" + if [[ -n "$(pgrep "${prog%% *}")" ]]; then + printf -- '%s\n' "$prog" exit 0 fi done @@ -28,11 +28,11 @@ fi # Scan to find one that is installed for prog in "$@"; do - if [[ -x "`which $prog 2>/dev/null`" ]]; then - printf '%s\n' "$prog" + if [[ -x "$(which "${prog%% *}" 2>/dev/null)" ]]; then + printf -- '%s\n' "$prog" exit 0 fi done -printf '%s\n' "$cmd: no suitable program found" +printf -- '%s\n' "$cmd: no suitable program found" >&2 exit 1 |