Merge branch 'feature/fix-installer' into develop

Makefile

 GIT_EXEC_PATH=`git --exec-path 2>/dev/null || echo /usr/libexec/git-core`
 
+# files that need mode 755
+EXEC_FILES=git-flow
+
+# files that need mode 644
+SCRIPT_FILES =git-flow-feature
+SCRIPT_FILES+=git-flow-hotfix
+SCRIPT_FILES+=git-flow-release
+SCRIPT_FILES+=git-flow-support
+SCRIPT_FILES+=git-flow-version
+SCRIPT_FILES+=shFlags.sh
+
 all:
 	@echo "usage: make install"
 	@echo "       make uninstall"
 
 install:
-	# TODO: Add installation of shFlags to this file too
 	install -d -m 0755 $(GIT_EXEC_PATH)
-	install -m 0755 git-flow $(GIT_EXEC_PATH)
-	install -m 0644 \
-		git-flow-feature \
-		git-flow-hotfix \
-		git-flow-release \
-		git-flow-support \
-		git-flow-version \
-		$(GIT_EXEC_PATH)
+	install -m 0755 $(EXEC_FILES) $(GIT_EXEC_PATH)
+	install -m 0644 $(SCRIPT_FILES) $(GIT_EXEC_PATH)
 
 uninstall:
-	test -d $(GIT_EXEC_PATH) && rm -f $(GIT_EXEC_PATH)/git-flow*
+	test -d $(GIT_EXEC_PATH) && \
+	cd $(GIT_EXEC_PATH) && \
+	rm -f $(EXEC_FILES) $(SCRIPT_FILES)

git-flow

@@ -54,7 +54,7 @@ main() {
 	fi
 
 	# use the shFlags project to parse the command line arguments
-	. "$GITFLOW_DIR/shFlags/src/shflags"
+	. "$GITFLOW_DIR/shFlags.sh"
 	#DEFINE_boolean quiet 0 'run without output' q
 	#DEFINE_boolean verbose 0 'run verbose (more output)' v
 	FLAGS "$@" || exit $?

shFlags.sh

+shFlags/src/shflags
\ No newline at end of file