From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Andreas Färber" <andreas.faerber@web.de>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 5/6] Makefile: use "ln -f" instead of "rm && ln"
Date: Mon, 29 Mar 2021 18:31:43 +0200 [thread overview]
Message-ID: <patch-5.7-f81708f6120-20210329T162327Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.7-00000000000-20210329T162327Z-avarab@gmail.com>
Change the invocations and behavior of "ln-or-cp.sh" to not assume
that we're going to "rm" the file in question beforehand.
This reduces the complexity of these rules, and as a bonus means it's
now safe to "make install" on a system that may have running "git"
programs, before this we'd be racing the "rm && ln/cp" and wouldn't
have a working "git" (or one of the built-ins) in the interim.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Makefile | 10 ++--------
ln-or-cp.sh | 5 ++---
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 29d9bade5a8..466df1a8e90 100644
--- a/Makefile
+++ b/Makefile
@@ -2204,8 +2204,7 @@ version.sp version.s version.o: EXTRA_CPPFLAGS = \
$(BUILT_INS): GIT-LNCPFLAGS
$(BUILT_INS): git$X
- $(QUIET_BUILT_IN)$(RM) $@ && \
- ./ln-or-cp.sh \
+ $(QUIET_BUILT_IN)./ln-or-cp.sh \
--install-symlinks "$(INSTALL_SYMLINKS)" \
$< $@
@@ -2558,8 +2557,7 @@ git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
$(REMOTE_CURL_ALIASES): GIT-LNCPFLAGS
$(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
- $(QUIET_LNCP)$(RM) $@ && \
- ./ln-or-cp.sh \
+ $(QUIET_LNCP)./ln-or-cp.sh \
--install-symlinks "$(INSTALL_SYMLINKS)" \
$< $@
@@ -3021,7 +3019,6 @@ endif
destdir_from_execdir_SQ=$$(echo '$(gitexecdir_relative_SQ)' | sed -e 's|[^/][^/]*|..|g') && \
{ test "$$bindir/" = "$$execdir/" || \
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
- $(RM) "$$execdir/$$p" && \
./ln-or-cp.sh \
--install-symlinks "$(INSTALL_SYMLINKS)" \
--no-install-hardlinks "$(NO_INSTALL_HARDLINKS)" \
@@ -3031,7 +3028,6 @@ endif
done; \
} && \
for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
- $(RM) "$$bindir/$$p" && \
./ln-or-cp.sh \
--install-symlinks "$(INSTALL_SYMLINKS)" \
--no-install-hardlinks "$(NO_INSTALL_HARDLINKS)" \
@@ -3039,7 +3035,6 @@ endif
"$$bindir/git$X" "$$bindir/$$p"; \
done && \
for p in $(BUILT_INS); do \
- $(RM) "$$execdir/$$p" && \
if test -z "$(SKIP_DASHED_BUILT_INS)"; \
then \
./ln-or-cp.sh \
@@ -3051,7 +3046,6 @@ endif
done && \
remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
for p in $$remote_curl_aliases; do \
- $(RM) "$$execdir/$$p" && \
./ln-or-cp.sh \
--install-symlinks "$(INSTALL_SYMLINKS)" \
--no-install-hardlinks "$(NO_INSTALL_HARDLINKS)" \
diff --git a/ln-or-cp.sh b/ln-or-cp.sh
index 663ffd0489d..37380993c64 100755
--- a/ln-or-cp.sh
+++ b/ln-or-cp.sh
@@ -40,11 +40,10 @@ link="$2"
hardlink_or_cp () {
if test -z "$no_install_hardlinks" -a -z "$no_cross_directory_hardlinks"
then
- if ! ln "$target" "$link"
+ if ! ln -f "$target" "$link"
then
cp "$target" "$link"
fi
-
else
cp "$target" "$link"
fi
@@ -53,7 +52,7 @@ hardlink_or_cp () {
main_with_fallbacks () {
if test -n "$install_symlinks" -o -n "$no_install_hardlinks"
then
- if ! ln -s "$symlink_target" "$link"
+ if ! ln -f -s "$symlink_target" "$link"
then
hardlink_or_cp
fi
--
2.31.1.461.gd47399f6574
next prev parent reply other threads:[~2021-03-29 16:33 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-07 13:20 [PATCH] Makefile: generate 'git' as 'cc [...] -o git+ && mv git+ git' Ævar Arnfjörð Bjarmason
2021-03-07 20:41 ` Junio C Hamano
2021-03-08 12:38 ` Ævar Arnfjörð Bjarmason
2021-03-08 17:21 ` Junio C Hamano
2021-03-08 18:26 ` Jeff King
2021-03-29 16:20 ` [PATCH v2 0/5] Makefile: don't die on AIX with open ./git Ævar Arnfjörð Bjarmason
2021-03-29 16:20 ` [PATCH v2 1/5] Makefile: rename objects in-place, don't clobber Ævar Arnfjörð Bjarmason
2021-03-29 18:21 ` Junio C Hamano
2021-03-29 18:26 ` Junio C Hamano
2021-03-29 23:24 ` Ævar Arnfjörð Bjarmason
2021-03-30 0:21 ` Junio C Hamano
2021-03-31 14:17 ` Ævar Arnfjörð Bjarmason
2021-03-31 18:50 ` Junio C Hamano
2021-03-29 16:20 ` [PATCH v2 2/5] Makefile: rename scripts " Ævar Arnfjörð Bjarmason
2021-03-29 18:40 ` Junio C Hamano
2021-03-29 23:28 ` Ævar Arnfjörð Bjarmason
2021-03-29 16:20 ` [PATCH v2 3/5] Makefile: don't needlessly "rm $@ $@+" before "mv $@+ $@" Ævar Arnfjörð Bjarmason
2021-03-29 18:46 ` Junio C Hamano
2021-03-29 16:20 ` [PATCH v2 4/5] Makefile: add the ".DELETE_ON_ERROR" flag Ævar Arnfjörð Bjarmason
2021-03-29 18:51 ` Junio C Hamano
2021-03-29 23:31 ` Ævar Arnfjörð Bjarmason
2021-03-29 23:58 ` Junio C Hamano
2021-03-30 15:11 ` Jeff King
2021-03-30 18:36 ` Junio C Hamano
2021-03-31 6:58 ` Jeff King
2021-03-31 18:36 ` Junio C Hamano
2021-03-31 22:29 ` Johannes Schindelin
2021-03-29 16:20 ` [PATCH v2 5/5] Makefile: don't "rm configure" before generating it Ævar Arnfjörð Bjarmason
2021-03-29 16:31 ` [PATCH 0/6] Makefile: make non-symlink & non-hardlink install sane Ævar Arnfjörð Bjarmason
2021-03-29 16:31 ` [PATCH 1/6] Makefile: symlink the same way under "symlinks" and "no hardlinks" Ævar Arnfjörð Bjarmason
2021-03-29 22:17 ` Junio C Hamano
2021-03-29 16:31 ` [PATCH 2/6] Makefile: begin refactoring out "ln || ln -s || cp" pattern Ævar Arnfjörð Bjarmason
2021-03-29 22:20 ` Junio C Hamano
2021-03-29 16:31 ` [PATCH 3/6] Makefile: refactor " Ævar Arnfjörð Bjarmason
2021-03-29 22:24 ` Junio C Hamano
2021-03-30 15:20 ` Jeff King
2021-03-30 18:36 ` Junio C Hamano
2021-03-29 16:31 ` [PATCH 4/6] Makefile: make INSTALL_SYMLINKS affect the build directory Ævar Arnfjörð Bjarmason
2021-03-29 22:31 ` Junio C Hamano
2021-03-31 14:04 ` Ævar Arnfjörð Bjarmason
2021-03-29 16:31 ` Ævar Arnfjörð Bjarmason [this message]
2021-03-29 22:46 ` [PATCH 5/6] Makefile: use "ln -f" instead of "rm && ln" Junio C Hamano
2021-03-29 16:31 ` [PATCH 6/6] Makefile: add a INSTALL_FALLBACK_LN_CP mode Ævar Arnfjörð Bjarmason
2021-03-29 22:53 ` Junio C Hamano
2021-03-31 14:03 ` Ævar Arnfjörð Bjarmason
2021-03-31 18:45 ` Junio C Hamano
2021-03-31 19:01 ` Ævar Arnfjörð Bjarmason
2021-03-29 23:08 ` [PATCH 0/6] Makefile: make non-symlink & non-hardlink install sane Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-5.7-f81708f6120-20210329T162327Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=andreas.faerber@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).