[hackers] [wmii] Fix wmiirc problems in recent commits. || Kris Maglione

changeset: 2784:9466b4993b71
tag: tip
user: Kris Maglione <kris_AT_suckless.org>
date: Wed Oct 13 17:33:02 2010 -0400
files: alternative_wmiircs/python/wmiirc cmd/wmii.sh.sh mk/common.mk mk/wmii.mk
description:
Fix wmiirc problems in recent commits.

diff -r c463907119e5 -r 9466b4993b71 alternative_wmiircs/python/wmiirc
--- a/alternative_wmiircs/python/wmiirc Thu Oct 07 16:31:42 2010 -0400
+++ b/alternative_wmiircs/python/wmiirc Wed Oct 13 17:33:02 2010 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env @PYTHON@
 import os, sys
 path = []
 for p in os.environ.get("WMII_CONFPATH", "").split(':'):
diff -r c463907119e5 -r 9466b4993b71 cmd/wmii.sh.sh
--- a/cmd/wmii.sh.sh Thu Oct 07 16:31:42 2010 -0400
+++ b/cmd/wmii.sh.sh Wed Oct 13 17:33:02 2010 -0400
@@ -96,8 +96,8 @@
         eval=""; [ "$1" = -e ] && eval=1 && shift
         _wi_events="$(_wi_text "$@")
 $_wi_events"
- # -n "$eval" ] && echo "$_wi_events" | awk "$(_wi_script)" >&2
- [ -n "$eval" ] && eval "$(echo "$_wi_events" | awk "$(_wi_script)")"
+ # -n "$eval" ] && printf %s "$_wi_events" | awk "$(_wi_script)" >&2
+ [ -n "$eval" ] && eval "$(printf %s "$_wi_events" | awk "$(_wi_script)")"
 }
 
 wi_events <<'!'
diff -r c463907119e5 -r 9466b4993b71 mk/common.mk
--- a/mk/common.mk Thu Oct 07 16:31:42 2010 -0400
+++ b/mk/common.mk Wed Oct 13 17:33:02 2010 -0400
@@ -15,7 +15,7 @@
                 $(INSTALL) -b 0644 $$f $(DIR) $$f; \
         done
         for f in $(EXECS); do \
- $(INSTALL) -b 0755 $$f $(DIR) $$f; \
+ $(INSTALL) 0755 $$f $(DIR) $$f; \
         done
 
 simpleuninstall:
diff -r c463907119e5 -r 9466b4993b71 mk/wmii.mk
--- a/mk/wmii.mk Thu Oct 07 16:31:42 2010 -0400
+++ b/mk/wmii.mk Wed Oct 13 17:33:02 2010 -0400
@@ -24,16 +24,17 @@
           '-DLOCALCONF=\"$(LOCALCONF)\"' '-DGLOBALCONF=\"$(GLOBALCONF)\"' \
           -DIXP_NEEDAPI=129
 
-FILTER = sed "s|@CONFPREFIX@|$(ETC)|g; \
+FILTER = sed "s|@ALTDOC@|$(DOC)/alternative_wmiircs|g; \
+ s|@BINSH@|$(BINSH)|g; \
+ s|@CONFDIR@|$(CONFDIR)|g; \
+ s|@CONFPREFIX@|$(ETC)|g; \
+ s|@DOCDIR@|$(DOC)|g; \
+ s|@EXAMPLES@|$(DOC)/examples|g; \
               s|@GLOBALCONF@|$(GLOBALCONF)|g; \
+ s|@LIBDIR@|$(LIBDIR)|g; \
               s|@LOCALCONF@|$(LOCALCONF)|g; \
- s|@CONFDIR@|$(CONFDIR)|g; \
- s|@DOCDIR@|$(DOC)|g; \
- s|@ALTDOC@|$(DOC)/alternative_wmiircs|g; \
- s|@EXAMPLES@|$(DOC)/examples|g; \
+ s|@PYTHON@|$(PYTHON)|g; \
+ s|@TERMINAL@|$(TERMINAL)|g; \
               s|@VERSION@|$(VERSION)|g; \
- s|@LIBDIR@|$(LIBDIR)|g; \
- s|@BINSH@|$(BINSH)|g; \
- s|@TERMINAL@|$(TERMINAL)|g; \
               /^@@/d;"
 
Received on Wed Oct 13 2010 - 23:33:07 CEST