Fix wmiirc problems in recent commits.

sunaku · Oct 13, 2010 · 42280d2 · 42280d2
1 parent 50062c2
commit 42280d2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/alternative_wmiircs/python/wmiirc b/alternative_wmiircs/python/wmiirc
@@ -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 --git a/cmd/wmii.sh.sh b/cmd/wmii.sh.sh
@@ -96,8 +96,8 @@ wi_events() {
 	eval=""; [ "$1" = -e ] && eval=1 && shift
 	_wi_events="$(_wi_text "$@")
 $_wi_events"
-	# -n "$eval" ] && echo "$_wi_events" | awk "$(_wi_script)" >&2
+	# -n "$eval" ] && printf %s "$_wi_events" | awk "$(_wi_script)" >&2
-	[ -n "$eval" ] && eval "$(echo "$_wi_events" | awk "$(_wi_script)")"
+	[ -n "$eval" ] && eval "$(printf %s "$_wi_events" | awk "$(_wi_script)")"
 }
 
 wi_events <<'!'

diff --git a/mk/common.mk b/mk/common.mk
@@ -15,7 +15,7 @@ simpleinstall:
 		$(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 --git a/mk/wmii.mk b/mk/wmii.mk
@@ -24,16 +24,17 @@ CFLAGS += '-DVERSION=\"$(VERSION)\"' '-DCOPYRIGHT=\"$(COPYRIGHT)\"' \
 	  '-DLOCALCONF=\"$(LOCALCONF)\"' '-DGLOBALCONF=\"$(GLOBALCONF)\"' \
 	  -DIXP_NEEDAPI=129
 
-FILTER = sed "s|@CONFPREFIX@|$(ETC)|g; \
+FILTER = sed "s|@ALTDOC@|$(DOC)/alternative_wmiircs|g; \
-	      s|@GLOBALCONF@|$(GLOBALCONF)|g; \
+	      s|@BINSH@|$(BINSH)|g; \
-	      s|@LOCALCONF@|$(LOCALCONF)|g; \
 	      s|@CONFDIR@|$(CONFDIR)|g; \
+	      s|@CONFPREFIX@|$(ETC)|g; \
 	      s|@DOCDIR@|$(DOC)|g; \
-	      s|@ALTDOC@|$(DOC)/alternative_wmiircs|g; \
 	      s|@EXAMPLES@|$(DOC)/examples|g; \
-	      s|@VERSION@|$(VERSION)|g; \
+	      s|@GLOBALCONF@|$(GLOBALCONF)|g; \
 	      s|@LIBDIR@|$(LIBDIR)|g; \
-	      s|@BINSH@|$(BINSH)|g; \
+	      s|@LOCALCONF@|$(LOCALCONF)|g; \
+	      s|@PYTHON@|$(PYTHON)|g; \
 	      s|@TERMINAL@|$(TERMINAL)|g; \
+	      s|@VERSION@|$(VERSION)|g; \
 	      /^@@/d;"