Skip to contentSkip to conversation

scalar: fix wrong shell hashbang

PATCH In review ZheNing Hu via GitGitGadget 4 participants 4 messages Sep 17, 2022 – Sep 20, 2022

lore
Share & tools
lore

ZheNing Hu via GitGitGadget

author
#0 lore raw

PATCH 1/1 scalar: fix wrong shell hashbang

From: ZheNing Hu <[email protected]>

$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 protected]>

---
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(+)
contrib/scalar/Makefile +3 -0
index 37f283f35d7..b2a81d9eb45 100644
@@ -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

Signature · 1 line
gitgitgadget
#1 lore raw
Quoted 15 lines · ZheNing Hu via GitGitGadget

From: ZheNing Hu <[email protected]>

$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 protected]>

---
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:

Quoted 9 lines

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.

Thanks for finding this! However, while your patch fixes the error you've identified (I was able to recreate both the original issue and apply your patch to fix it), I believe it has already been fixed in 'next' by 7b5c93c6c6 (scalar: include in standard Git build & installation, 2022-09-02) (archive: [1]).

[1] https://lore.kernel.org/git/bc2092a7a7aae640b547bde8db0c0a26ce31278a.1662134210.git.gitgitgadget@gmail.com/

#2 lore raw
Quoted 5 lines · Victoria Dye

Thanks for finding this! However, while your patch fixes the error you've identified (I was able to recreate both the original issue and apply your patch to fix it), I believe it has already been fixed in 'next' by 7b5c93c6c6 (scalar: include in standard Git build & installation, 2022-09-02) (archive: [1]).

Yup, thanks. The topic that contains that commit should graduate to the master branch before -rc1, like this afternoon ;-)

#3 lore raw
In reply to Victoria Dye
Quoted 27 lines · Victoria Dye <[email protected]> 于2022年9月19日周一 04:08写道：
Quoted 15 lines · ZheNing Hu via GitGitGadget

From: ZheNing Hu <[email protected]>

$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 protected]>

---
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:

Quoted 9 lines

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.

Quoted 7 lines

Thanks for finding this! However, while your patch fixes the error you've identified (I was able to recreate both the original issue and apply your patch to fix it), I believe it has already been fixed in 'next' by 7b5c93c6c6 (scalar: include in standard Git build & installation, 2022-09-02) (archive: [1]).

[1] https://lore.kernel.org/git/bc2092a7a7aae640b547bde8db0c0a26ce31278a.1662134210.git.gitgitgadget@gmail.com/

It seems that this problem has been solved, thanks!

--
ZheNing Hu