dot/bashrc, dot/zshrc: Turn on `!' expansion explicitly.

[profile] / Makefile

diff --git a/Makefile b/Makefile
index 00d06e4..af5dc13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,7 @@ SCRIPTLINKS         += update-buildable-branch
 
 ## Shells.
 DOTLINKS               += .profile .shell-rc .shell-logout
-DOTLINKS               += .shrc .rcrc
+DOTLINKS               += .shrc
 DOTLINKS               += .zprofile .zshrc .zlogout .zshenv
 DOTLINKS               += .bash_profile .bash_completion .bash_logout
 DOTLINKS               += .bashrc .inputrc
@@ -159,6 +159,14 @@ DOTLINKS           += .bashrc .inputrc
 .bash_logout_SRC        = shell-logout
 .zlogout_SRC            = shell-logout
 
+## The Plan 9 `rc' shell.  This needs special hacking, because the Linux port
+## and Plan 9 From User Space have incompatible syntax.
+DOTLINKS               += lib/profile
+lib/profile_SRC                 = rcrc
+all:: $(HOME)/.rcrc
+$(HOME)/.rcrc: dot/rcrc
+       $(call v_tag,SED)sed 's/; if not/else/' $< >$@.new && mv $@.new $@
+
 ## Git.
 DOTSUBST               += .gitconfig
 SCRIPTLINKS            += git-copyright-dates
@@ -330,6 +338,19 @@ $(relax)### generated by $(HERE)/Makefile; do not edit!" \
 ### Processing script links.
 
 script-source           = $(HERE)/bin/$(or $($1_SRC), $1)
+
+ifeq ($(prefix-shebang-p),t)
+all:: $(addprefix $(HOME)/bin/, $(SCRIPTLINKS))
+$(addprefix $(HOME)/bin/, $(SCRIPTLINKS)): $(HOME)/bin/%: \
+               $$(call script-source,$$*) Makefile
+       $(call v_tag,SHEBANG)mkdir -p $(dir $@) && \
+               rm -f $@.new && \
+               sed "1s\a\(#! *\)/\a\1$(SHEBANG_PREFIX)/\a" \
+                       $(call script-source,$*) >$@.new && \
+               chmod --reference=$(call script-source,$*) $@.new && \
+               mv $@.new $@
+       $(script-hook/$*)
+else
 scriptlink-ok-p                 = \
        $(call symlink-ok-p,$(HOME)/bin/$1,$(call script-source,$1))
 all:: $(addprefix $(HOME)/bin/, $(SCRIPTLINKS))
@@ -340,6 +361,7 @@ $(addprefix $(HOME)/bin/, $(SCRIPTLINKS)): $(HOME)/bin/%: \
                ln -s $(call script-source,$*) $@.new && \
                mv $@.new $@
        $(script-hook/$*)
+endif
 
 all:: $(addprefix $(HOME)/bin/, $(SCRIPTLINKS))