From: "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Derrick Stolee <derrickstolee@github.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
ZheNing Hu <adlternative@gmail.com>,
ZheNing Hu <adlternative@gmail.com>
Subject: [PATCH] scalar: fix wrong shell hashbang
Date: Sat, 17 Sep 2022 13:11:21 +0000 [thread overview]
Message-ID: <pull.1355.git.1663420281187.gitgitgadget@gmail.com> (raw)
From: ZheNing Hu <adlternative@gmail.com>
$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 <adlternative@gmail.com>
---
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
next reply other threads:[~2022-09-17 13:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-17 13:11 ZheNing Hu via GitGitGadget [this message]
2022-09-18 20:08 ` [PATCH] scalar: fix wrong shell hashbang Victoria Dye
2022-09-19 18:44 ` Junio C Hamano
2022-09-20 12:43 ` ZheNing Hu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1355.git.1663420281187.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=adlternative@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.