From a12f3189bcf6d2cf277acfa7824961b158bd57e6 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sat, 29 Nov 2014 22:38:56 -0500
Subject: stuff

---
 .local/bin/pick                | 4 ++--
 .local/bin/x-pdf               | 3 +--
 .local/bin/x-terminal-emulator | 3 +--
 .local/bin/x-www-browser       | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)

(limited to '.local')

diff --git a/.local/bin/pick b/.local/bin/pick
index ed2d44d..6dc905f 100755
--- a/.local/bin/pick
+++ b/.local/bin/pick
@@ -19,7 +19,7 @@ if [[ $1 = -s ]]; then
 	shift
 	# Scan to find a running instance
 	for prog in "$@"; do
-		if [[ -n "`pgrep $prog`" ]]; then
+		if [[ -n "$(pgrep "${prog%% *}")" ]]; then
 			printf '%s\n' "$prog"
 			exit 0
 		fi
@@ -28,7 +28,7 @@ fi
 
 # Scan to find one that is installed
 for prog in "$@"; do
-    if [[ -x "`which $prog 2>/dev/null`" ]]; then
+    if [[ -x "$(which "${prog%% *}" 2>/dev/null)" ]]; then
 		printf '%s\n' "$prog"
 		exit 0
     fi
diff --git a/.local/bin/x-pdf b/.local/bin/x-pdf
index 3610fde..cfaa258 100755
--- a/.local/bin/x-pdf
+++ b/.local/bin/x-pdf
@@ -1,4 +1,3 @@
 #!/bin/sh
 
-`pick zathura mupdf okular evince xpdf` "$@"
-exit $?
+eval $(pick atril zathura mupdf okular evince xpdf 'emacsclient -c') "$@"
diff --git a/.local/bin/x-terminal-emulator b/.local/bin/x-terminal-emulator
index 049b081..075dda5 100755
--- a/.local/bin/x-terminal-emulator
+++ b/.local/bin/x-terminal-emulator
@@ -1,4 +1,3 @@
 #!/bin/sh
 
-`pick emacsterm urxvt gnome-terminal xterm` "$@"
-exit $?
+eval $(pick 'emacsterm -c' 'urxvt' 'xterm' 'gnome-terminal') "$@"
diff --git a/.local/bin/x-www-browser b/.local/bin/x-www-browser
index bbd8943..945dcfc 100755
--- a/.local/bin/x-www-browser
+++ b/.local/bin/x-www-browser
@@ -1,4 +1,3 @@
 #!/bin/sh
 
-`pick -s conkeror iceweasel icecat firefox` "$@"
-exit $?
+eval $(pick -s iceweasel icecat firefox conkeror) "$@"
-- 
cgit v1.2.3