mirror of https://github.com/0intro/wmii
Fix wmiirc problems in recent commits.
This commit is contained in:
parent
089bf7bba7
commit
04c1693f8a
|
@ -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(':'):
|
||||
|
|
|
@ -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" ] && 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 <<'!'
|
||||
|
|
|
@ -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:
|
||||
|
|
19
mk/wmii.mk
19
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; \
|
||||
s|@GLOBALCONF@|$(GLOBALCONF)|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|@VERSION@|$(VERSION)|g; \
|
||||
s|@LIBDIR@|$(LIBDIR)|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|@PYTHON@|$(PYTHON)|g; \
|
||||
s|@TERMINAL@|$(TERMINAL)|g; \
|
||||
s|@VERSION@|$(VERSION)|g; \
|
||||
/^@@/d;"
|
||||
|
||||
|
|
Loading…
Reference in New Issue