diff options
| author | Marek Szuba <marecki@gentoo.org> | 2021-06-13 13:03:51 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2021-06-13 13:08:44 +0100 |
| commit | be1016621c919ec293667becd69e6dd2b854a2fc (patch) | |
| tree | 152aac3efed1ecdf80a431f0e9c80857a4c13ae0 /dev-vcs/git-flow/files/git-flow-1.12.3_scriptdir.patch | |
| parent | 05356acabc874bfb89b52c64e4c9540d981f0813 (diff) | |
| download | gentoo-be1016621c919ec293667becd69e6dd2b854a2fc.tar.gz gentoo-be1016621c919ec293667becd69e6dd2b854a2fc.tar.bz2 gentoo-be1016621c919ec293667becd69e6dd2b854a2fc.zip | |
dev-vcs/git-flow: some QA fixes
1. Inherit eclasses before declaring any variables, just in case;
2. Fix indentation of SRC_URI;
3. Put non-executable support scripts in /usr/libexec/git-flow instead
of polluting /usr/bin;
4. Use PF rather than P as the directory name for docs;
5. Change the sed delimiter to ! so that slashes in paths do not have to
be escaped;
6. Install to ED rather than D so that we (hopefully) support Prefix.
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'dev-vcs/git-flow/files/git-flow-1.12.3_scriptdir.patch')
| -rw-r--r-- | dev-vcs/git-flow/files/git-flow-1.12.3_scriptdir.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/dev-vcs/git-flow/files/git-flow-1.12.3_scriptdir.patch b/dev-vcs/git-flow/files/git-flow-1.12.3_scriptdir.patch new file mode 100644 index 000000000000..34fab234d41e --- /dev/null +++ b/dev-vcs/git-flow/files/git-flow-1.12.3_scriptdir.patch @@ -0,0 +1,72 @@ +Keeps the auxiliary, non-executable script files out of /usr/bin, and +avoids calling uname every time git-flow runs. + +--- a/git-flow ++++ b/git-flow +@@ -41,41 +41,9 @@ + set -x + fi + +-# Setup the GITFLOW_DIR for different operating systems. +-# This is mostly to make sure that we get the correct directory when the +-# git-flow file is a symbolic link +-case $(uname -s) in +-Linux) +- export GITFLOW_DIR=$(dirname "$(readlink -e "$0")") +- ;; +-FreeBSD|OpenBSD|NetBSD) +- export FLAGS_GETOPT_CMD='/usr/local/bin/getopt' +- export GITFLOW_DIR=$(dirname "$(realpath "$0")") +- ;; +-Darwin) +- PRG="$0" +- while [ -h "$PRG" ]; do +- link=$(readlink "$PRG") +- if expr "$link" : '/.*' > /dev/null; then +- PRG="$link" +- else +- PRG="$(dirname "$PRG")/$link" +- fi +- done +- export GITFLOW_DIR=$(dirname "$PRG") +- ;; +-*MINGW*) +- export GITFLOW_DIR=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") +- pwd () { +- builtin pwd -W +- } +- ;; +-*) +- # The sed expression here replaces all backslashes by forward slashes. +- # This helps our Windows users, while not bothering our Unix users.) +- export GITFLOW_DIR=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") +- ;; +-esac ++# Setup GITFLOW_DIR ++GITFLOW_DIR="@PREFIX@/libexec/git-flow" ++export GITFLOW_DIR + + # Extra environment settings + if [ -f ~/.gitflow_export ]; then +--- a/Makefile ++++ b/Makefile +@@ -30,6 +30,7 @@ + + datarootdir=$(prefix)/share + docdir=$(datarootdir)/doc/gitflow ++scriptdir=$(prefix)/libexec/git-flow + # files that need mode 755 + EXEC_FILES=git-flow + +@@ -55,9 +56,10 @@ + + install: + install -d -m 0755 $(prefix)/bin ++ install -d -m 0755 $(scriptdir) + install -d -m 0755 $(docdir)/hooks + install -m 0755 $(EXEC_FILES) $(prefix)/bin +- install -m 0644 $(SCRIPT_FILES) $(prefix)/bin ++ install -m 0644 $(SCRIPT_FILES) $(scriptdir) + install -m 0644 $(HOOK_FILES) $(docdir)/hooks + + uninstall: |