[hackers] [wmii] Test -e $PLAN9/bin/rc in wmii script. Use AWKPATH config.mk flag instead of /usr/bin/awk.

changeset: 1966:56561d78f439
tag: tip
user: Kris Maglione <jg_AT_suckless.org>
date: Mon Feb 26 06:53:02 2007 -0500
summary: Test -e $PLAN9/bin/rc in wmii script. Use AWKPATH config.mk flag instead of /usr/bin/awk.

diff -r 5e8ce97f5c82 -r 56561d78f439 Makefile
--- a/Makefile Mon Feb 26 06:08:50 2007 -0500
+++ b/Makefile Mon Feb 26 06:53:02 2007 -0500
@@ -58,7 +58,9 @@ install: all
         @echo installing executable files to ${DESTDIR}${PREFIX}/bin
         @mkdir -p -m 0755 ${DESTDIR}${PREFIX}/bin
         @for i in ${SCRIPTS}; do \
- sed 's|CONFPREFIX|${CONFPREFIX}|g; s|CONFVERSION|${CONFVERSION}|g' < $$i >${DESTDIR}${PREFIX}/bin/$$i; \
+ sed 's|CONFPREFIX|${CONFPREFIX}|g; \
+ s|CONFVERSION|${CONFVERSION}|g; \
+ s|AWKPATH|${AWKPATH}|g' < $$i >${DESTDIR}${PREFIX}/bin/$$i; \
                 chmod 755 ${DESTDIR}${PREFIX}/bin/$$i; \
          done
         @for i in ${BIN}; do\
diff -r 5e8ce97f5c82 -r 56561d78f439 config.mk
--- a/config.mk Mon Feb 26 06:08:50 2007 -0500
+++ b/config.mk Mon Feb 26 06:53:02 2007 -0500
@@ -8,6 +8,7 @@ PREFIX = /usr/local
 PREFIX = /usr/local
 CONFPREFIX = ${PREFIX}/etc
 MANPREFIX = ${PREFIX}/share/man
+AWKPATH = /usr/bin/awk
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
diff -r 5e8ce97f5c82 -r 56561d78f439 wmii
--- a/wmii Mon Feb 26 06:08:50 2007 -0500
+++ b/wmii Mon Feb 26 06:53:02 2007 -0500
@@ -7,7 +7,7 @@ export WMII_ADDRESS="unix!$WMII_NS_DIR/w
 
 if [ -x /usr/local/plan9/bin/rc ]; then
         WMIIRC=`PATH="$WMII_CONFPATH:$PATH" which rc.wmii`
-elif [ -n "$PLAN9" ]; then
+elif [ -x "$PLAN9/bin/rc" ]; then
         WMIIRC="$PLAN9/bin/rc `PATH="$WMII_CONFPATH:$PATH" which rc.wmii`"
 else
         WMIIRC=`PATH="$WMII_CONFPATH:$PATH" which wmiirc`
diff -r 5e8ce97f5c82 -r 56561d78f439 wmiiloop
--- a/wmiiloop Mon Feb 26 06:08:50 2007 -0500
+++ b/wmiiloop Mon Feb 26 06:53:02 2007 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/awk -f
+#!AWKPATH -f
 /^#/ && $2 !~ /^Events|Actions|Key$/ || !begin, \
 /^#/ && $2 ~ /^(Events|Actions|Key)$/ {
         begin = 1
Received on Mon Feb 26 2007 - 12:57:11 UTC