summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-03-28 20:58:24 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-03-28 20:58:24 -0400
commitad2c5c3d23c97ca776c4d9603dfc8d359b37a552 (patch)
tree145814cc33989e563e4297a156026c4d4f4dc2f0
parentadbb5f8597288f3394cb7659474f420bad236ded (diff)
parentaa05f001d233e8b8db55ed276b5b8d32d048cd9e (diff)
Merge .prefix/bin/git into build64-par
-rw-r--r--.git.info.exclude1
-rwxr-xr-x.prefix/bin/x-pdf9
-rwxr-xr-x.prefix/bin/x-terminal-emulator10
-rwxr-xr-x.prefix/bin/x-www-browser14
-rwxr-xr-x.prefix/bin/xmessage2
l---------.prefix/bin/xterm1
6 files changed, 36 insertions, 1 deletions
diff --git a/.git.info.exclude b/.git.info.exclude
index 00e5109..ab160af 100644
--- a/.git.info.exclude
+++ b/.git.info.exclude
@@ -78,6 +78,5 @@ history.*
# Ignore these files for no good reason
.terminfo
.wine*
-.prefix
.offlineimap
.bogofilter
diff --git a/.prefix/bin/x-pdf b/.prefix/bin/x-pdf
new file mode 100755
index 0000000..020ff7e
--- /dev/null
+++ b/.prefix/bin/x-pdf
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -x "`which okular 2>/dev/null`" ]; then
+ okular "$@"
+if [ -x "`which evince 2>/dev/null`" ]; then
+ evince "$@"
+elif [ -x "`which xpdf 2>/dev/null`" ]; then
+ xpdf "$@"
+fi
diff --git a/.prefix/bin/x-terminal-emulator b/.prefix/bin/x-terminal-emulator
new file mode 100755
index 0000000..f7290b4
--- /dev/null
+++ b/.prefix/bin/x-terminal-emulator
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ -x "`which emacsterm`" ]; then
+ emacsterm $@
+elif [ -x "`which urxvt`" ]; then
+ urxvt $@
+elif [ -x "`which gnome-terminal`" ]; then
+ gnome-terminal $@
+elif [ -x "`which xterm`"]; then
+ xterm $@
+fi
diff --git a/.prefix/bin/x-www-browser b/.prefix/bin/x-www-browser
new file mode 100755
index 0000000..0ead72a
--- /dev/null
+++ b/.prefix/bin/x-www-browser
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+list='firefox iceweasel icecat conkeror'
+
+looking=true
+for prog in $list; do
+ if $looking && [ -n "`pgrep $prog`" ]; then
+ $prog $@
+ looking=false
+ fi
+done
+if $looking; then
+ conkeror $@
+fi
diff --git a/.prefix/bin/xmessage b/.prefix/bin/xmessage
new file mode 100755
index 0000000..bd30b5e
--- /dev/null
+++ b/.prefix/bin/xmessage
@@ -0,0 +1,2 @@
+#!/bin/sh
+gxmessage $@ -fn 'Monospace'
diff --git a/.prefix/bin/xterm b/.prefix/bin/xterm
new file mode 120000
index 0000000..e8d5184
--- /dev/null
+++ b/.prefix/bin/xterm
@@ -0,0 +1 @@
+x-terminal-emulator \ No newline at end of file