Merge branch 'release/0.4.11'

README.md

@@ -24,7 +24,9 @@ A quick cheatsheet was made by Daniel Kummer:
 
 ## Installing git-flow
 
-npm -i gitflow (Mac and Linux users only)
+```shell
+npm i -g gitflow #Mac and Linux users only, will fail on windows
+```
 
 ## Contributing
 

git-flow-version

@@ -35,7 +35,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-GITFLOW_VERSION=0.4.10
+GITFLOW_VERSION=0.4.11
 
 initialize() {
 	# A function can not be empty. Comments count as empty.

gitflow-installer.sh

+#!/bin/bash
+
+# git-flow make-less installer for *nix systems, by Rick Osborne
+# Based on the git-flow core Makefile:
+# http://github.com/dreidev/gitflow/blob/master/Makefile
+
+# Licensed under the same restrictions as git-flow:
+# http://github.com/dreidev/gitflow/blob/develop/LICENSE
+
+# Updated for the fork at petervanderdoes
+
+usage() {
+	echo "Usage: [environment] gitflow-installer.sh [install|uninstall] [stable|develop]"
+	echo "Environment:"
+	echo "   PREFIX=$PREFIX"
+	echo "   REPO_HOME=$REPO_HOME"
+	echo "   REPO_NAME=$REPO_NAME"
+	exit 1
+}
+
+# Does this need to be smarter for each host OS?
+if [ -z "$PREFIX" ] ; then
+	PREFIX="/usr/local"
+fi
+
+if [ -z "$REPO_NAME" ] ; then
+	REPO_NAME="gitflow"
+fi
+
+if [ -z "$REPO_HOME" ] ; then
+	REPO_HOME="https://github.com/dreidev/gitflow.git"
+fi
+
+EXEC_PREFIX="$PREFIX"
+BINDIR="$EXEC_PREFIX/bin"
+DATAROOTDIR="$PREFIX/share"
+DOCDIR="$DATAROOTDIR/doc/gitflow"
+
+EXEC_FILES="git-flow"
+SCRIPT_FILES="git-flow-init git-flow-feature git-flow-bugfix git-flow-hotfix git-flow-release git-flow-support git-flow-version gitflow-common gitflow-shFlags git-flow-config"
+HOOK_FILES="$REPO_NAME/hooks/*"
+
+
+echo "### git-flow no-make installer ###"
+
+case "$1" in
+uninstall)
+	echo "Uninstalling git-flow from $PREFIX"
+	if [ -d "$BINDIR" ] ; then
+		for script_file in $SCRIPT_FILES $EXEC_FILES ; do
+			echo "rm -vf $BINDIR/$script_file"
+			rm -vf "$BINDIR/$script_file"
+		done
+		rm -rf "$DOCDIR"
+	else
+		echo "The '$BINDIR' directory was not found."
+	fi
+	exit
+	;;
+help)
+	usage
+	exit
+	;;
+install)
+	if [ -z $2 ]; then
+		usage
+		exit
+	fi
+	echo "Installing git-flow to $BINDIR"
+	if [ -d "$REPO_NAME" -a -d "$REPO_NAME/.git" ] ; then
+		echo "Using existing repo: $REPO_NAME"
+	else
+		echo "Cloning repo from GitHub to $REPO_NAME"
+		git clone "$REPO_HOME" "$REPO_NAME"
+	fi
+	cd "$REPO_NAME"
+	git pull
+	cd "$OLDPWD"
+	case "$2" in
+	stable)
+		cd "$REPO_NAME"
+		git checkout master
+		cd "$OLDPWD"
+		;;
+	develop)
+		cd "$REPO_NAME"
+		git checkout develop
+		cd "$OLDPWD"
+		;;
+	*)
+		usage
+		exit
+		;;
+	esac
+	install -v -d -m 0755 "$PREFIX/bin"
+	install -v -d -m 0755 "$DOCDIR/hooks"
+	for exec_file in $EXEC_FILES ; do
+		install -v -m 0755 "$REPO_NAME/$exec_file" "$BINDIR"
+	done
+	for script_file in $SCRIPT_FILES ; do
+		install -v -m 0644 "$REPO_NAME/$script_file" "$BINDIR"
+	done
+	for hook_file in $HOOK_FILES ; do
+		install -v -m 0644 "$hook_file"  "$DOCDIR/hooks"
+	done
+	exit
+	;;
+*)
+	usage
+	exit
+	;;
+esac

package.json

 {
   "name": "gitflow",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "description": "Modified gitflow for dreidev",
   "main": "src/index.js",
   "scripts": {
@@ -26,8 +26,13 @@
     "drazious",
     "cmosh"
   ],
-  "author": "cmosh <cmosh@live.com>",
-  "license": "MIT",
+  "author": {
+    "name": "Clive Makamara",
+    "email": "clive@makamara.me",
+    "url": "http://github.com/cmosh",
+    "organization": "dreidev"
+    },
+  "license": "LGPL",
   "bugs": {
     "url": "https://github.com/dreidev/gitflow/issues"
   },

src/flow-bugfix.js

 require('shelljs/global');
 const program = require('commander');
 program.parse(process.argv);
-var args = program.args;
+var args = program.args.toString().replace(',',' ');
 
 if (!which('git')) {
   echo('Sorry, this script requires git');
@@ -10,7 +10,7 @@ if (!which('git')) {
 
 
 exec('git flow bugfix '+args,{silent:true}, function(code, stdout, stderr) {
-  console.log(stdout.replace("git ",""));
+  console.log(stdout.replace('git ',''));
   console.log(stderr);
 });
 

src/flow-config.js

 require('shelljs/global');
 const program = require('commander');
 program.parse(process.argv);
-var args = program.args;
+var args = program.args.toString().replace(',',' ');
 
 if (!which('git')) {
   echo('Sorry, this script requires git');

src/flow-feature.js

 require('shelljs/global');
 const program = require('commander');
 program.parse(process.argv);
-var args = program.args;
+var args = program.args.toString().replace(',',' ');
 
 if (!which('git')) {
   echo('Sorry, this script requires git');

src/flow-hotfix.js

 require('shelljs/global');
 const program = require('commander');
 program.parse(process.argv);
-var args = program.args;
+var args = program.args.toString().replace(',',' ');
 
 if (!which('git')) {
   echo('Sorry, this script requires git');

src/flow-init.js

 require('shelljs/global');
 const program = require('commander');
 program.parse(process.argv);
-var args = program.args;
+var args = program.args.toString().replace(',',' ');
 
 if (!which('git')) {
   echo('Sorry, this script requires git');

src/flow-log.js

 require('shelljs/global');
 const program = require('commander');
 program.parse(process.argv);
-var args = program.args;
+var args = program.args.toString().replace(',',' ');
 
 if (!which('git')) {
   echo('Sorry, this script requires git');

src/flow-release.js

 require('shelljs/global');
 const program = require('commander');
 program.parse(process.argv);
-var args = program.args;
+var args = program.args.toString().replace(',',' ');
 
 if (!which('git')) {
   echo('Sorry, this script requires git');

src/flow-support.js

 require('shelljs/global');
 const program = require('commander');
 program.parse(process.argv);
-var args = program.args;
+var args = program.args.toString().replace(',',' ');
 
 if (!which('git')) {
   echo('Sorry, this script requires git');