wmii

commit 0b7acc5330625a5c24baabc027bd216da60c6d83
parent 1951514d995586315ff60ab75b23866ff3355892
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Fri, 14 Apr 2006 10:28:10 +0200

removed rc/extern redirection, removed OLD_PATH stuff (unnecessary), I don't care about WMII_FONT/*COLORS being in env, three vars are ok, changed progs file location (this allows running wmiirc from shell as well, because DISPLAY is not screwed up)


Diffstat:
cmd/wm/wmii
 | 
3
+--
rc/extern
 | 
10
----------
rc/wmiirc
 | 
6
+++---

3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/cmd/wm/wmii b/cmd/wm/wmii
@@ -3,8 +3,7 @@
 
 wmiiwm -c || exit 1
 
-OLD_PATH=$PATH export OLD_PATH
-PATH=$HOME/.wmii-3:CONFPREFIX/wmii-3:$PATH export PATH
+PATH=$PATH:$HOME/.wmii-3:CONFPREFIX/wmii-3 export PATH
 WMII_ADDRESS=unix!/tmp/ns.$USER.$DISPLAY/wmii export WMII_ADDRESS
 
 mkdir -m 700 /tmp/ns.$USER.$DISPLAY 2>/dev/null
diff --git a/rc/extern b/rc/extern
@@ -1,10 +0,0 @@
-#!/bin/sh
-# clean the environment and execute the given command
-
-PATH=$OLD_PATH export PATH
-unset OLD_PATH
-unset WMII_FONT
-unset WMII_NORMCOLORS
-unset WMII_SELCOLORS
-
-exec "$@"
diff --git a/rc/wmiirc b/rc/wmiirc
@@ -45,7 +45,7 @@ EOF
 # MISC
 xsetroot -solid '#0b1014'
 status &
-proglist $OLD_PATH >/tmp/ns.$USER.$DISPLAY/progs &
+proglist $PATH >/tmp/.wmiimenu.progs &
 
 # SHORTCUTS
 xwrite /def/grabmod $MODKEY
@@ -128,13 +128,13 @@ do
 		$MODKEY-a)
 			`proglist CONFPREFIX/wmii-3:$HOME/.wmii-3 | wmiimenu` &;;
 		$MODKEY-p)
-			extern `wmiimenu </tmp/ns.$USER.$DISPLAY/progs` &;;
+			`wmiimenu </tmp/.wmiimenu.progs` &;;
 		$MODKEY-t)
 			xwrite /ctl view "`wmiir read /tags | wmiimenu`" &;;
 		$MODKEY-[0-9])
 			xwrite /ctl view `echo $1 | sed 's/.*-//'`;;
 		$MODKEY-Return)
-			extern xterm &;;
+			xterm &;;
 		$MODKEY-Shift-$LEFT)
 			xwrite /view/sel/sel/ctl sendto prev;;
 		$MODKEY-Shift-$RIGHT)