Subject: [PATCH] scalar: fix wrong shell hashbang

From: "ZheNing Hu via GitGitGadget" <[email-masked]>
Date: Sat, 17 Sep 2022 13:11:21 +0000

From: ZheNing Hu <[email-masked]>

$SHELL_PATH_SQ haven't been set in scalar's Makefile,
bin-wrappers/scalar will begin with wrong hashbang "#!",
fix it by setting $SHELL_PATH and $SHELL_PATH_SQ in
scalar's Makefile.

Signed-off-by: ZheNing Hu <[email-masked]>
---
    scalar: fix wrong shell hashbang
    
    The bin-wrappers/scalar seems like missing setting $SHELL_PATH_SQ which
    lead to I can't execute bin-wrappers/scalar correctly, which output
    error:
    
    zsh: exec format error: scalar
    
    (this bug will not turn out in bash)
    
    The bin-wrappers/scalar begin with wrong hashbang "#!", which cannot
    figure out by zsh. So this patch want to fix this problem.
    
    v1: Setting $SHELL_PATH and $SHELL_PATH_SQ in scalar/Makefile.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1355%2Fadlternative%2Fzh%2Fscalar-fix-hashbang-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1355/adlternative/zh/scalar-fix-hashbang-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1355

 contrib/scalar/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/scalar/Makefile b/contrib/scalar/Makefile
index 37f283f35d7..b2a81d9eb45 100644
--- a/contrib/scalar/Makefile
+++ b/contrib/scalar/Makefile
@@ -8,6 +8,9 @@ include ../../config.mak.uname
 -include ../../config.mak.autogen
 -include ../../config.mak
 
+SHELL_PATH ?= $(SHELL)
+SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+
 TARGETS = scalar$(X) scalar.o
 GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a

base-commit: d3fa443f97e3a8d75b51341e2d5bac380b7422df
-- 
gitgitgadget