1 |
johu 14/03/22 15:49:16 |
2 |
|
3 |
Added: git-flow-0.4.1-unbundle-shflags.patch |
4 |
Log: |
5 |
New package wrt bug #419943. Import from johu overlay. Initial ebuild by Moritz Schlarb <moschlar@××××××××.de>. |
6 |
|
7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: git-flow-0.4.1-unbundle-shflags.patch |
16 |
=================================================================== |
17 |
diff --git a/Makefile b/Makefile |
18 |
index fbbfd2c..b0e2490 100644 |
19 |
--- a/Makefile |
20 |
+++ b/Makefile |
21 |
@@ -40,14 +40,12 @@ SCRIPT_FILES+=git-flow-release |
22 |
SCRIPT_FILES+=git-flow-support |
23 |
SCRIPT_FILES+=git-flow-version |
24 |
SCRIPT_FILES+=gitflow-common |
25 |
-SCRIPT_FILES+=gitflow-shFlags |
26 |
|
27 |
all: |
28 |
@echo "usage: make install" |
29 |
@echo " make uninstall" |
30 |
|
31 |
install: |
32 |
- @test -f gitflow-shFlags || (echo "Run 'git submodule init && git submodule update' first." ; exit 1 ) |
33 |
install -d -m 0755 $(prefix)/bin |
34 |
install -m 0755 $(EXEC_FILES) $(prefix)/bin |
35 |
install -m 0644 $(SCRIPT_FILES) $(prefix)/bin |
36 |
diff --git a/git-flow b/git-flow |
37 |
index 93e9f0f..7b643d3 100755 |
38 |
--- a/git-flow |
39 |
+++ b/git-flow |
40 |
@@ -78,7 +78,7 @@ main() { |
41 |
export POSIXLY_CORRECT=1 |
42 |
|
43 |
# use the shFlags project to parse the command line arguments |
44 |
- . "$GITFLOW_DIR/gitflow-shFlags" |
45 |
+ . /usr/share/misc/shflags |
46 |
FLAGS_PARENT="git flow" |
47 |
FLAGS "$@" || exit $? |
48 |
eval set -- "${FLAGS_ARGV}" |