From 8b3fdab7a5788ec578141f2ab66444be5fc43c1b Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Sat, 4 Feb 2012 09:28:55 +0200 Subject: [PATCH 1/6] README.mdown: (Contributing): Mention setting up PATH --- README.mdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.mdown b/README.mdown index 70d944d99..da834ce94 100644 --- a/README.mdown +++ b/README.mdown @@ -59,6 +59,10 @@ Fork the repository. Then, run: git clone --recursive git@github.com:/gitflow.git cd gitflow git branch master origin/master + + # ... Arrange you PATH to include this cloned directory, Something like: + # ... PATH="$PATH:$(pwd)" + git flow init -d git flow feature start From 2718991de48de5c9cd211d7c8524d988727f660a Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Sat, 4 Feb 2012 09:32:49 +0200 Subject: [PATCH 2/6] README.mdown: (Contributing): Use POSIX to setting PATH --- README.mdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.mdown b/README.mdown index da834ce94..02077fd50 100644 --- a/README.mdown +++ b/README.mdown @@ -66,8 +66,8 @@ Fork the repository. Then, run: git flow init -d git flow feature start -Then, do work and commit your changes. **Hint**: ``export PATH=`pwd`:$PATH`` -from within the gitflow directory makes sure you're using the version of +Then, do work and commit your changes. Permanently set ``export +PATH="$(pwd):$PATH"`` which makes sure you're using the version of gitflow you're currently developing. git flow feature publish From 1c72e3ef4bd0ca6f11846dd825a71f24f92a9d11 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Sat, 4 Feb 2012 16:11:49 +0200 Subject: [PATCH 3/6] Makefile: Add new targets: help, install-symlink --- Makefile | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 764bd23b0..5a241bc2b 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,11 @@ # modification, are permitted provided that the following conditions are met: # # 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. +# this list of conditions and the following disclaimer. # # 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF @@ -47,17 +47,50 @@ SCRIPT_FILES+=git-flow-version SCRIPT_FILES+=gitflow-common SCRIPT_FILES+=gitflow-shFlags +PWD=$(shell pwd) + all: - @echo "usage: make install" - @echo " make uninstall" + @echo "Run: make help" + +# Rule: help - display Makefile rules +help: + @sed -n "/^# Rule:/s/.*Rule: *//p;" Makefile | sort + -install: +check: @test -f gitflow-shFlags || (echo "Run 'git submodule init && git submodule update' first." ; exit 1 ) + +# Rule: install - standard install to $(prefix)/bin +install: check install -d -m 0755 $(prefix)/bin install -m 0755 $(EXEC_FILES) $(prefix)/bin install -m 0644 $(SCRIPT_FILES) $(prefix)/bin +# Rule: install-symlink - symlink install from current dir to $(prefix)/bin +install-symlink: check + install -d -m 0755 $(prefix)/bin + + @echo "# Making symlinks..." + + @cd $(prefix)/bin ; \ + for file in $(EXEC_FILES); \ + do \ + chmod 755 $(PWD)/$$file ; \ + ln -vsf $(PWD)/$$file $$file ; \ + done && \ + for file in $(SCRIPT_FILES); \ + do \ + chmod 644 $(PWD)/$$file ; \ + ln -vsf $(PWD)/$$file $$file ; \ + done + + +# Rule: uninstall - remove installed files from $(prefix)/bin uninstall: test -d $(prefix)/bin && \ cd $(prefix)/bin && \ rm -f $(EXEC_FILES) $(SCRIPT_FILES) + +.PHONY: check install install-symlink uninstall + +# End of file From 116b97024b1083f339ed9a4f1e836242e7ada089 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Sat, 4 Feb 2012 09:28:55 +0200 Subject: [PATCH 4/6] README.mdown: (Contributing): Mention setting up PATH --- README.mdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.mdown b/README.mdown index 70d944d99..da834ce94 100644 --- a/README.mdown +++ b/README.mdown @@ -59,6 +59,10 @@ Fork the repository. Then, run: git clone --recursive git@github.com:/gitflow.git cd gitflow git branch master origin/master + + # ... Arrange you PATH to include this cloned directory, Something like: + # ... PATH="$PATH:$(pwd)" + git flow init -d git flow feature start From c1e7fb22f76fda456e6e155a395783cc5467fb25 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Sat, 4 Feb 2012 09:32:49 +0200 Subject: [PATCH 5/6] README.mdown: (Contributing): Use POSIX to setting PATH --- README.mdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.mdown b/README.mdown index da834ce94..02077fd50 100644 --- a/README.mdown +++ b/README.mdown @@ -66,8 +66,8 @@ Fork the repository. Then, run: git flow init -d git flow feature start -Then, do work and commit your changes. **Hint**: ``export PATH=`pwd`:$PATH`` -from within the gitflow directory makes sure you're using the version of +Then, do work and commit your changes. Permanently set ``export +PATH="$(pwd):$PATH"`` which makes sure you're using the version of gitflow you're currently developing. git flow feature publish From 71e653656158bbb8d02ed58b0309ca34042ee957 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Sat, 4 Feb 2012 16:11:49 +0200 Subject: [PATCH 6/6] Makefile: Add new targets: help, install-symlink --- Makefile | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 764bd23b0..5a241bc2b 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,11 @@ # modification, are permitted provided that the following conditions are met: # # 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. +# this list of conditions and the following disclaimer. # # 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF @@ -47,17 +47,50 @@ SCRIPT_FILES+=git-flow-version SCRIPT_FILES+=gitflow-common SCRIPT_FILES+=gitflow-shFlags +PWD=$(shell pwd) + all: - @echo "usage: make install" - @echo " make uninstall" + @echo "Run: make help" + +# Rule: help - display Makefile rules +help: + @sed -n "/^# Rule:/s/.*Rule: *//p;" Makefile | sort + -install: +check: @test -f gitflow-shFlags || (echo "Run 'git submodule init && git submodule update' first." ; exit 1 ) + +# Rule: install - standard install to $(prefix)/bin +install: check install -d -m 0755 $(prefix)/bin install -m 0755 $(EXEC_FILES) $(prefix)/bin install -m 0644 $(SCRIPT_FILES) $(prefix)/bin +# Rule: install-symlink - symlink install from current dir to $(prefix)/bin +install-symlink: check + install -d -m 0755 $(prefix)/bin + + @echo "# Making symlinks..." + + @cd $(prefix)/bin ; \ + for file in $(EXEC_FILES); \ + do \ + chmod 755 $(PWD)/$$file ; \ + ln -vsf $(PWD)/$$file $$file ; \ + done && \ + for file in $(SCRIPT_FILES); \ + do \ + chmod 644 $(PWD)/$$file ; \ + ln -vsf $(PWD)/$$file $$file ; \ + done + + +# Rule: uninstall - remove installed files from $(prefix)/bin uninstall: test -d $(prefix)/bin && \ cd $(prefix)/bin && \ rm -f $(EXEC_FILES) $(SCRIPT_FILES) + +.PHONY: check install install-symlink uninstall + +# End of file