wmii

commit a52993c53227570d7c6f5d5c78eabf50310cfd9d
parent 701f2a4414f98a619ce97d4d8dfae7f42183fadc
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Mon, 29 May 2006 11:18:35 +0200

merged



Diffstat:
cmd/wm/wmii
 | 
3
++-
cmd/wm/wmii.1
 | 
5
+++--
rc/wmiirc
 | 
2
+-

3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/cmd/wm/wmii b/cmd/wm/wmii
@@ -4,7 +4,8 @@
 wmiiwm -c || exit 1
 
 SOCKET=`mktemp /tmp/.wmii.address.$DISPLAY.XXXXXX` || exit 2
-PATH=$PATH:$HOME/.wmii-4:CONFPREFIX/wmii-4 export PATH
+OLD_PATH="$PATH" export OLD_PATH
+PATH="$HOME/.wmii-4:CONFPREFIX/wmii-4:$PATH" export PATH
 WMII_ADDRESS=unix!$SOCKET export WMII_ADDRESS
 
 wmiiwm -a $WMII_ADDRESS &
diff --git a/cmd/wm/wmii.1 b/cmd/wm/wmii.1
@@ -59,9 +59,10 @@ The following variables are set and exported within
 .B wmii
 and thus can be used in actions:
 .TP
-PATH
+PATH, OLD_PATH
 .B wmii
-adds the local and global actions directory to the existing PATH.
+adds the local and global actions directory to the front of the existing PATH.
+The original value is saved in OLD_PATH.
 .TP
 WMII_ADDRESS
 Socket file of
diff --git a/rc/wmiirc b/rc/wmiirc
@@ -139,7 +139,7 @@ do
 		$MODKEY-a)
 			`proglist $HOME/.wmii-4 CONFPREFIX/wmii-4 | wmiimenu` &;;
 		$MODKEY-p)
-			wmiisetsid `wmiimenu <$PROGS_FILE` &;;
+			PATH="$OLD_PATH" wmiisetsid `wmiimenu <$PROGS_FILE` &;;
 		$MODKEY-t)
 			xwrite /ctl view "`wmiir ls /tag | sed 's,/,,; /^sel$/d' | wmiimenu`" &;;
 		$MODKEY-[0-9])