From 780424e2c0a90d1d291cee6f3913aed70b8737e9 Mon Sep 17 00:00:00 2001 From: Debian Haskell Group Date: Wed, 5 Oct 2016 19:27:23 +0000 Subject: [PATCH] do-not-use-SHELL Gbp-Pq: Name do-not-use-SHELL --- driver/ghci/ghc.mk | 4 ++-- rules/shell-wrapper.mk | 6 +++--- utils/mkdirhier/ghc.mk | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk index ba6984c3..aa7d0200 100644 --- a/driver/ghci/ghc.mk +++ b/driver/ghci/ghc.mk @@ -21,7 +21,7 @@ install_driver_ghci: $(call INSTALL_DIR,"$(DESTDIR)$(bindir)") $(call removeFiles, "$(WRAPPER)") $(CREATE_SCRIPT) "$(WRAPPER)" - echo '#!$(SHELL)' >> "$(WRAPPER)" + echo '#!/bin/sh' >> "$(WRAPPER)" echo 'exec "$(bindir)/ghc-$(ProjectVersion)" --interactive "$$@"' >> "$(WRAPPER)" $(EXECUTABLE_FILE) "$(WRAPPER)" $(call removeFiles,"$(DESTDIR)$(bindir)/ghci") @@ -56,7 +56,7 @@ install_driver_ghcii: GHCII_SCRIPT_VERSIONED = $(DESTDIR)$(bindir)/ghcii-$(Proje install_driver_ghcii: $(call INSTALL_DIR,$(DESTDIR)$(bindir)) $(call removeFiles,"$(GHCII_SCRIPT)") - echo "#!$(SHELL)" >> $(GHCII_SCRIPT) + echo "#!/bin/sh" >> $(GHCII_SCRIPT) echo 'exec "$$(dirname "$$0")"/ghc --interactive "$$@"' >> $(GHCII_SCRIPT) $(EXECUTABLE_FILE) $(GHCII_SCRIPT) cp $(GHCII_SCRIPT) $(GHCII_SCRIPT_VERSIONED) diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index 05dd0eff..3c837e8f 100644 --- a/rules/shell-wrapper.mk +++ b/rules/shell-wrapper.mk @@ -36,7 +36,7 @@ $$(INPLACE_WRAPPER): $$($1_$2_SHELL_WRAPPER_NAME) endif $$(INPLACE_WRAPPER): $$($1_$2_INPLACE) $$(call removeFiles, $$@) - echo '#!$$(SHELL)' >> $$@ + echo '#!/bin/sh' >> $$@ echo 'executablename="$$(TOP)/$$<"' >> $$@ echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"' >> $$@ echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"' >> $$@ @@ -74,7 +74,7 @@ install_$1_$2_wrapper: $$(call INSTALL_DIR,"$$(DESTDIR)$$(bindir)") $$(call removeFiles, "$$(WRAPPER)") $$(CREATE_SCRIPT) "$$(WRAPPER)" - echo '#!$$(SHELL)' >> "$$(WRAPPER)" + echo '#!/bin/sh' >> "$$(WRAPPER)" echo 'exedir="$$(ghclibexecdir)/bin"' >> "$$(WRAPPER)" echo 'exeprog="$$($1_$2_PROG)"' >> "$$(WRAPPER)" echo 'executablename="$$$$exedir/$$$$exeprog"' >> "$$(WRAPPER)" @@ -99,7 +99,7 @@ BINDIST_EXTRAS += $$($1_$2_BINDIST_WRAPPER) $$($1_$2_BINDIST_WRAPPER): $1/$2/build/tmp/$$($1_$2_PROG) $$(call removeFiles, $$@) - echo '#!$$(SHELL)' >> $$@ + echo '#!/bin/sh' >> $$@ ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES" echo '$$(call prependLibraryPath,$$($1_$2_DEP_LIB_REL_DIRS_SEARCHPATH))' >> $$@ endif diff --git a/utils/mkdirhier/ghc.mk b/utils/mkdirhier/ghc.mk index a6565775..6ea86d3d 100644 --- a/utils/mkdirhier/ghc.mk +++ b/utils/mkdirhier/ghc.mk @@ -15,7 +15,7 @@ $(MKDIRHIER) : utils/mkdirhier/mkdirhier.sh -mkdir $(INPLACE_BIN) -mkdir $(INPLACE_LIB) $(call removeFiles,$@) - echo '#!$(SHELL)' >> $@ + echo '#!/bin/sh' >> $@ cat utils/mkdirhier/mkdirhier.sh >> $@ $(EXECUTABLE_FILE) $@ -- 2.30.2