From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Daniel Jacques" <dnj@google.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Steffen Prohaska" <prohaska@zib.de>,
"John Keeping" <john@keeping.me.uk>, "Stan Hu" <stanhu@gmail.com>,
"Richard Clamp" <richardc@unixbeard.net>,
"Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [RFC/PATCH 4/5] Makefile: add NO_INSTALL_SYMLINKS_FALLBACK switch
Date: Fri, 2 Nov 2018 22:37:42 +0000 [thread overview]
Message-ID: <20181102223743.4331-5-avarab@gmail.com> (raw)
In-Reply-To: <87efkkdwcv.fsf@evledraar.gmail.com>
Add a switch for use in conjunction with the INSTALL_SYMLINKS flag
added in ad874608d8 ("Makefile: optionally symlink libexec/git-core
binaries to bin/git", 2018-03-13).
Now it's possible to install git with:
INSTALL_SYMLINKS=YesPlease NO_INSTALL_SYMLINKS_FALLBACK=YesPlease
And know for sure that there's not going to be any silent fallbacks on
hardlinks or copying of files if symlinking fails.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Makefile | 5 ++++
install_programs | 69 ++++++++++++++++++++++++++++++++----------------
2 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index aa6ca1fa68..07c8b74353 100644
--- a/Makefile
+++ b/Makefile
@@ -342,6 +342,10 @@ all::
# within the same directory in some cases, INSTALL_SYMLINKS will
# always symlink to the final target directly.
#
+# Define NO_INSTALL_SYMLINKS_FALLBACK if in conjunction with
+# INSTALL_SYMLINKS if you'd prefer not to have the install procedure
+# fallack on hardlinking or copying if "ln -s" fails.
+#
# Define NO_CROSS_DIRECTORY_HARDLINKS if you plan to distribute the installed
# programs as a tar, where bin/ and libexec/ might be on different file systems.
#
@@ -2818,6 +2822,7 @@ endif
--flag-install-symlinks="$(INSTALL_SYMLINKS)" \
--flag-no-install-hardlinks="$(NO_INSTALL_HARDLINKS)" \
--flag-no-cross-directory-hardlinks="$(NO_CROSS_DIRECTORY_HARDLINKS)" \
+ --flag-no-install-symlinks-fallback="$(NO_INSTALL_SYMLINKS_FALLBACK)" \
--list-bindir-standalone="git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS))" \
--list-bindir-git-dashed="$(filter $(install_bindir_programs),$(BUILT_INS))" \
--list-execdir-git-dashed="$(BUILT_INS)" \
diff --git a/install_programs b/install_programs
index 367e9a6cdf..51e08019dd 100755
--- a/install_programs
+++ b/install_programs
@@ -30,6 +30,9 @@ do
--flag-no-cross-directory-hardlinks=*)
NO_CROSS_DIRECTORY_HARDLINKS="${1#--flag-no-cross-directory-hardlinks=}"
;;
+ --flag-no-install-symlinks-fallback=*)
+ NO_INSTALL_SYMLINKS_FALLBACK="${1#--flag-no-install-symlinks-fallback=}"
+ ;;
--list-bindir-standalone=*)
list_bindir_standalone="${1#--list-bindir-standalone=}"
;;
@@ -55,41 +58,61 @@ if test "$bindir/" != "$execdir/"
then
for p in $list_bindir_standalone; do
$RM "$execdir/$p" &&
- test -n "$INSTALL_SYMLINKS" &&
- ln -s "$destdir_from_execdir/$bindir_relative/$p" "$execdir/$p" ||
- { test -z "$NO_INSTALL_HARDLINKS$NO_CROSS_DIRECTORY_HARDLINKS" &&
- ln "$bindir/$p" "$execdir/$p" ||
- cp "$bindir/$p" "$execdir/$p" || exit; }
+ if test -n "$INSTALL_SYMLINKS" -a -n "$NO_INSTALL_SYMLINKS_FALLBACK"
+ then
+ ln -s "$destdir_from_execdir/$bindir_relative/$p" "$execdir/$p"
+ else
+ test -n "$INSTALL_SYMLINKS" &&
+ ln -s "$destdir_from_execdir/$bindir_relative/$p" "$execdir/$p" ||
+ { test -z "$NO_INSTALL_HARDLINKS$NO_CROSS_DIRECTORY_HARDLINKS" &&
+ ln "$bindir/$p" "$execdir/$p" ||
+ cp "$bindir/$p" "$execdir/$p" || exit; }
+ fi
done
fi &&
for p in $list_bindir_git_dashed
do
$RM "$bindir/$p" &&
- test -n "$INSTALL_SYMLINKS" &&
- ln -s "git$X" "$bindir/$p" ||
- { test -z "$NO_INSTALL_HARDLINKS" &&
- ln "$bindir/git$X" "$bindir/$p" ||
- ln -s "git$X" "$bindir/$p" ||
- cp "$bindir/git$X" "$bindir/$p" || exit; }
+ if test -n "$INSTALL_SYMLINKS" -a -n "$NO_INSTALL_SYMLINKS_FALLBACK"
+ then
+ ln -s "git$X" "$bindir/$p"
+ else
+ test -n "$INSTALL_SYMLINKS" &&
+ ln -s "git$X" "$bindir/$p" ||
+ { test -z "$NO_INSTALL_HARDLINKS" &&
+ ln "$bindir/git$X" "$bindir/$p" ||
+ ln -s "git$X" "$bindir/$p" ||
+ cp "$bindir/git$X" "$bindir/$p" || exit; }
+ fi
done &&
for p in $list_execdir_git_dashed; do
$RM "$execdir/$p" &&
- test -n "$INSTALL_SYMLINKS" &&
- ln -s "$destdir_from_execdir/$bindir_relative/git$X" "$execdir/$p" ||
- { test -z "$NO_INSTALL_HARDLINKS" &&
- ln "$execdir/git$X" "$execdir/$p" ||
- ln -s "git$X" "$execdir/$p" ||
- cp "$execdir/git$X" "$execdir/$p" || exit; }
+ if test -n "$INSTALL_SYMLINKS" -a -n "$NO_INSTALL_SYMLINKS_FALLBACK"
+ then
+ ln -s "$destdir_from_execdir/$bindir_relative/git$X" "$execdir/$p"
+ else
+ test -n "$INSTALL_SYMLINKS" &&
+ ln -s "$destdir_from_execdir/$bindir_relative/git$X" "$execdir/$p" ||
+ { test -z "$NO_INSTALL_HARDLINKS" &&
+ ln "$execdir/git$X" "$execdir/$p" ||
+ ln -s "git$X" "$execdir/$p" ||
+ cp "$execdir/git$X" "$execdir/$p" || exit; }
+ fi
done &&
for p in $list_execdir_curl_aliases; do
$RM "$execdir/$p" &&
- test -n "$INSTALL_SYMLINKS" &&
- ln -s "git-remote-http$X" "$execdir/$p" ||
- { test -z "$NO_INSTALL_HARDLINKS" &&
- ln "$execdir/git-remote-http$X" "$execdir/$p" ||
- ln -s "git-remote-http$X" "$execdir/$p" ||
- cp "$execdir/git-remote-http$X" "$execdir/$p" || exit; }
+ if test -n "$INSTALL_SYMLINKS" -a -n "$NO_INSTALL_SYMLINKS_FALLBACK"
+ then
+ ln -s "git-remote-http$X" "$execdir/$p"
+ else
+ test -n "$INSTALL_SYMLINKS" &&
+ ln -s "git-remote-http$X" "$execdir/$p" ||
+ { test -z "$NO_INSTALL_HARDLINKS" &&
+ ln "$execdir/git-remote-http$X" "$execdir/$p" ||
+ ln -s "git-remote-http$X" "$execdir/$p" ||
+ cp "$execdir/git-remote-http$X" "$execdir/$p" || exit; }
+ fi
done
--
2.19.1.930.g4563a0d9d0
next prev parent reply other threads:[~2018-11-02 22:38 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-06 23:34 What's cooking in git.git (Mar 2018, #02; Tue, 6) Junio C Hamano
2018-03-07 12:34 ` Johannes Schindelin
2018-03-08 9:22 ` Ævar Arnfjörð Bjarmason
2018-03-08 13:12 ` Daniel Jacques
2018-03-13 12:36 ` Why don't we symlink libexec/git-core/* to bin/git? Ævar Arnfjörð Bjarmason
2018-03-13 18:36 ` Junio C Hamano
2018-03-13 19:32 ` Randall S. Becker
2018-03-13 20:39 ` [PATCH 0/3] Makefile: add a INSTALL_SYMLINKS option Ævar Arnfjörð Bjarmason
2018-03-13 20:39 ` [PATCH 1/3] Makefile: fix broken bindir_relative variable Ævar Arnfjörð Bjarmason
2018-03-13 20:39 ` [PATCH 2/3] Makefile: add a gitexecdir_relative variable Ævar Arnfjörð Bjarmason
2018-03-13 20:39 ` [PATCH 3/3] Makefile: optionally symlink libexec/git-core binaries to bin/git Ævar Arnfjörð Bjarmason
2018-03-14 7:20 ` Johannes Sixt
2018-03-14 10:14 ` Ævar Arnfjörð Bjarmason
2018-03-14 17:21 ` Linus Torvalds
2018-03-15 17:05 ` Johannes Schindelin
2018-03-15 17:42 ` Linus Torvalds
2018-03-16 11:48 ` Johannes Schindelin
2018-03-16 12:43 ` Ævar Arnfjörð Bjarmason
2018-03-19 11:34 ` Johannes Schindelin
2018-03-19 21:21 ` Linus Torvalds
2018-11-02 22:37 ` [RFC/PATCH 0/5] stop installing old libexec aliases like "git-init" Ævar Arnfjörð Bjarmason
2018-11-03 1:17 ` Junio C Hamano
2018-11-05 11:36 ` Ævar Arnfjörð Bjarmason
2018-11-12 13:33 ` Johannes Schindelin
2018-11-16 10:38 ` Ævar Arnfjörð Bjarmason
2018-11-16 16:00 ` Michael Haggerty
2018-11-16 19:22 ` Ævar Arnfjörð Bjarmason
2018-11-17 6:39 ` Jeff King
2018-11-22 12:48 ` Johannes Schindelin
2018-11-22 16:06 ` Jeff King
2018-11-23 11:19 ` Johannes Schindelin
2018-11-02 22:37 ` [RFC/PATCH 1/5] Makefile: move long inline shell loops in "install" into helper Ævar Arnfjörð Bjarmason
2018-11-04 1:09 ` Eric Sunshine
2018-11-12 14:03 ` Johannes Schindelin
2018-11-12 14:42 ` Ævar Arnfjörð Bjarmason
2018-11-12 16:32 ` Johannes Schindelin
2018-11-16 10:32 ` Ævar Arnfjörð Bjarmason
2018-11-02 22:37 ` [RFC/PATCH 2/5] Makefile: conform some of the code to our coding standards Ævar Arnfjörð Bjarmason
2018-11-02 22:37 ` [RFC/PATCH 3/5] Makefile: stop hiding failures during "install" Ævar Arnfjörð Bjarmason
2018-11-02 22:37 ` Ævar Arnfjörð Bjarmason [this message]
2018-11-04 1:01 ` [RFC/PATCH 4/5] Makefile: add NO_INSTALL_SYMLINKS_FALLBACK switch Eric Sunshine
2018-11-02 22:37 ` [RFC/PATCH 5/5] Makefile: Add a NO_INSTALL_BUILTIN_EXECDIR_ALIASES flag Ævar Arnfjörð Bjarmason
2018-11-04 1:04 ` Eric Sunshine
2018-11-12 14:14 ` Johannes Schindelin
2018-03-15 17:03 ` [PATCH 3/3] Makefile: optionally symlink libexec/git-core binaries to bin/git Johannes Schindelin
2018-03-14 10:18 ` Why don't we symlink libexec/git-core/* to bin/git? Ævar Arnfjörð Bjarmason
2018-03-14 16:07 ` Junio C Hamano
2018-03-15 17:16 ` Johannes Schindelin
2018-03-16 17:29 ` Duy Nguyen
2018-03-30 8:59 ` Johannes Schindelin
2018-03-09 6:15 ` What's cooking in git.git (Mar 2018, #02; Tue, 6) Martin Ågren
2018-03-09 9:54 ` Duy Nguyen
2018-03-09 17:19 ` 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=20181102223743.4331-5-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=dnj@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=peff@peff.net \
--cc=prohaska@zib.de \
--cc=richardc@unixbeard.net \
--cc=stanhu@gmail.com \
/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).