wmii: play with PATH better

13 files changed, 18 insertions, 15 deletions

diff --git a/.config/wmii/autostart b/.config/wmii/autostart
index d95ce34..dc37f40 100755
--- a/.config/wmii/autostart
+++ b/.config/wmii/autostart
@@ -1,5 +1,5 @@
 #!/bin/bash
-. "$HOME/.wmii/include.sh"
+. include.sh
 
 daemon lxpanel   &> /dev/null
 daemon nm-applet &> /dev/null
diff --git a/.config/wmii/config.sh b/.config/wmii/config.sh
index 1dac0ad..b87ae5c 100644
--- a/.config/wmii/config.sh
+++ b/.config/wmii/config.sh
@@ -219,9 +219,9 @@ Key() {
 		$MODKEY-a) ## Open wmii actions menu
 			Action $(path_ls $WMII_CONFPATH | wimenu -h "${HIST}.actions" -n 5000) & ;;
 		$MODKEY-x) ## Open program menu
-			setsid $(path_ls $PATH | wimenu -h "${HIST}.progs" -n 5000) & ;;
+			PATH=$_PATH setsid $(path_ls $PATH | wimenu -h "${HIST}.progs" -n 5000) & ;;
 		$MODKEY-Return) ## Launch a terminal
-			setsid x-terminal-emulator & ;;
+			PATH=$_PATH setsid x-terminal-emulator & ;;
 
 		## Tag actions
 		$MODKEY-t) ## Change to another tag
diff --git a/.config/wmii/help-events b/.config/wmii/help-events
index 25b7d41..08abd18 100755
--- a/.config/wmii/help-events
+++ b/.config/wmii/help-events
@@ -1,3 +1,3 @@
 #!/bin/bash
-. "$HOME/.wmii/include.sh"
+. include.sh
 scansection Event | xmessage -file -
diff --git a/.config/wmii/help-keys b/.config/wmii/help-keys
index c6e7038..6f4bd1c 100755
--- a/.config/wmii/help-keys
+++ b/.config/wmii/help-keys
@@ -1,3 +1,3 @@
 #!/bin/bash
-. "$HOME/.wmii/include.sh"
+. include.sh
 scansection Key | xmessage -file -
diff --git a/.config/wmii/include.sh b/.config/wmii/include.sh
index d4e58c3..0d639a2 100644
--- a/.config/wmii/include.sh
+++ b/.config/wmii/include.sh
@@ -7,5 +7,5 @@ if [ -z "$WMII_DIR" ]; then
     export WMII_DIR="$HOME/n/wmii"
 fi
 
-. "$HOME/.wmii/util.sh"
-. "$HOME/.wmii/config.sh"
+. util.sh
+. config.sh
diff --git a/.config/wmii/quit b/.config/wmii/quit
index 876a60e..27d9052 100755
--- a/.config/wmii/quit
+++ b/.config/wmii/quit
@@ -1,3 +1,3 @@
 #!/bin/bash
-. "$HOME/.wmii/include.sh"
+. include.sh
 echo quit >> $WMII_DIR/ctl
diff --git a/.config/wmii/rbar_battery b/.config/wmii/rbar_battery
index ae8980a..76723dc 100755
--- a/.config/wmii/rbar_battery
+++ b/.config/wmii/rbar_battery
@@ -1,5 +1,5 @@
 #!/bin/bash
-. "$HOME/.wmii/include.sh"
+. include.sh
 
 priority=$1
 
diff --git a/.config/wmii/rbar_clock b/.config/wmii/rbar_clock
index 18c4493..2307979 100755
--- a/.config/wmii/rbar_clock
+++ b/.config/wmii/rbar_clock
@@ -1,5 +1,5 @@
 #!/bin/bash
-. "$HOME/.wmii/include.sh"
+. include.sh
 
 priority=$1
 
diff --git a/.config/wmii/rbar_cpu b/.config/wmii/rbar_cpu
index 22da985..d5b70d3 100755
--- a/.config/wmii/rbar_cpu
+++ b/.config/wmii/rbar_cpu
@@ -1,5 +1,5 @@
 #!/bin/bash
-. "$HOME/.wmii/include.sh"
+. include.sh
 
 priority=$1
 
diff --git a/.config/wmii/rbar_wifi b/.config/wmii/rbar_wifi
index 2ada834..b78dce3 100755
--- a/.config/wmii/rbar_wifi
+++ b/.config/wmii/rbar_wifi
@@ -1,5 +1,5 @@
 #!/bin/bash
-. "$HOME/.wmii/include.sh"
+. include.sh
 
 priority=$1
 
diff --git a/.config/wmii/theme-solarized-dark b/.config/wmii/theme-solarized-dark
index 83285ba..fde361b 100644
--- a/.config/wmii/theme-solarized-dark
+++ b/.config/wmii/theme-solarized-dark
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Solarized-dark
 
-. $HOME/.wmii/theme-solarized
+. theme-solarized
 
 WMII_BACKGROUND="$SOL_BASE02"
 
diff --git a/.config/wmii/util.sh b/.config/wmii/util.sh
index 43d7d4a..61fb2c9 100644
--- a/.config/wmii/util.sh
+++ b/.config/wmii/util.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # I moved "fixes" into a separate file because it isn't so much configuration...
-. "$HOME/.wmii/fixes.sh"
+. fixes.sh
 
 ################################################################################
 # Added shell features                                                         #
diff --git a/.config/wmii/wmiirc b/.config/wmii/wmiirc
index 1f1ea18..a6bc4b4 100755
--- a/.config/wmii/wmiirc
+++ b/.config/wmii/wmiirc
@@ -1,5 +1,8 @@
 #!/bin/bash
-. "$HOME/.wmii/include.sh"
+export _PATH="$PATH"
+export PATH="$WMII_CONFPATH:$PATH"
+
+. include.sh
 
 wmiir xwrite /event WmiircQuit # close any existing wmiirc's