Merge tag '0.4.8' into develop

Updated readme

contrib/gitflow-installer.sh

@@ -2,10 +2,10 @@
 
 # git-flow make-less installer for *nix systems, by Rick Osborne
 # Based on the git-flow core Makefile:
-# http://github.com/petervanderdoes/gitflow-avh/blob/master/Makefile
+# http://github.com/dreidev/gitflow/blob/master/Makefile
 
 # Licensed under the same restrictions as git-flow:
-# http://github.com/petervanderdoes/gitflow-avh/blob/develop/LICENSE
+# http://github.com/dreidev/gitflow/blob/develop/LICENSE
 
 # Updated for the fork at petervanderdoes
 

git-flow-feature

@@ -996,7 +996,7 @@ h,help!          Show this help
 "
 
 	parse_args "$@"
-	require_name_arg
+	gitflow_require_name_arg
 
 	# sanity checks
 	require_branch "$BRANCH"

git-flow-version

@@ -35,7 +35,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-GITFLOW_VERSION=0.4.7
+GITFLOW_VERSION=0.4.8
 
 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/nvie/gitflow/blob/master/Makefile
-
-# Licensed under the same restrictions as git-flow:
-# http://github.com/nvie/gitflow/blob/develop/LICENSE
-
-# Does this need to be smarter for each host OS?
-if [ -z "$INSTALL_PREFIX" ] ; then
-	INSTALL_PREFIX="/usr/local/bin"
-fi
-
-if [ -z "$REPO_NAME" ] ; then
-	REPO_NAME="gitflow"
-fi
-
-if [ -z "$REPO_HOME" ] ; then
-	REPO_HOME="http://github.com/nvie/gitflow.git"
-fi
-
-EXEC_FILES="git-flow"
-SCRIPT_FILES="git-flow-init git-flow-feature git-flow-hotfix git-flow-release git-flow-support git-flow-version gitflow-common gitflow-shFlags"
-SUBMODULE_FILE="gitflow-shFlags"
-
-echo "### gitflow no-make installer ###"
-
-case "$1" in
-	uninstall)
-		echo "Uninstalling git-flow from $INSTALL_PREFIX"
-		if [ -d "$INSTALL_PREFIX" ] ; then
-			for script_file in $SCRIPT_FILES $EXEC_FILES ; do
-				echo "rm -vf $INSTALL_PREFIX/$script_file"
-				rm -vf "$INSTALL_PREFIX/$script_file"
-			done
-		else
-			echo "The '$INSTALL_PREFIX' directory was not found."
-			echo "Do you need to set INSTALL_PREFIX ?"
-		fi
-		exit
-		;;
-	help)
-		echo "Usage: [environment] gitflow-installer.sh [install|uninstall]"
-		echo "Environment:"
-		echo "   INSTALL_PREFIX=$INSTALL_PREFIX"
-		echo "   REPO_HOME=$REPO_HOME"
-		echo "   REPO_NAME=$REPO_NAME"
-		exit
-		;;
-	*)
-		echo "Installing git-flow to $INSTALL_PREFIX"
-		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
-		if [ -f "$REPO_NAME/$SUBMODULE_FILE" ] ; then
-			echo "Submodules look up to date"
-		else
-			echo "Updating submodules"
-			lastcwd=$PWD
-			cd "$REPO_NAME"
-			git submodule init
-			git submodule update
-			cd "$lastcwd"
-		fi
-		install -v -d -m 0755 "$INSTALL_PREFIX"
-		for exec_file in $EXEC_FILES ; do
-			install -v -m 0755 "$REPO_NAME/$exec_file" "$INSTALL_PREFIX"
-		done
-		for script_file in $SCRIPT_FILES ; do
-			install -v -m 0644 "$REPO_NAME/$script_file" "$INSTALL_PREFIX"
-		done
-		exit
-		;;
-esac

package.json

 {
   "name": "gitflow",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Modified gitflow for dreidev",
   "main": "src/index.js",
   "scripts": {
-    "postuninstall": "sudo make uninstall",
-    "postinstall": "curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh install stable"
+    "postinstall": "curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh install stable",
+    "postuninstall": "curl https://raw.githubusercontent.com/dreidev/gitflow/develop/contrib/gitflow-installer.sh > gitflow-installer.sh; chmod a+x gitflow-installer.sh; sudo bash gitflow-installer.sh uninstall"
   },
   "files": [
     "src/"

src/flow.js

@@ -5,12 +5,12 @@ const version = require('../package.json').version;
 
 program
   .version(version)
-  .command('bugfix [options...]','Command wrapper for git flow bugfix').alias('b')
-  .command('config [options...]','Command wrapper for git flow config').alias('c')
-  .command('feature [options...]','Command wrapper for git flow feature',{isDefault: true}).alias('fwf')
-  .command('hotfix [options...]','Command wrapper for git flow hotfix').alias('h')
-  .command('init [options...]','Command wrapper for git flow init').alias('i')
-  .command('log [options...]','Command wrapper for git flow log').alias('l')
-  .command('release [options...]','Command wrapper for git release').alias('r')
-  .command('support [options...]','Command wrapper for git support').alias('s')
+  .command('bugfix [options]','Command wrapper for git flow bugfix').alias('b')
+  .command('config [options]','Command wrapper for git flow config').alias('c')
+  .command('feature [options]','Command wrapper for git flow feature',{isDefault: true}).alias('fwf')
+  .command('hotfix [options]','Command wrapper for git flow hotfix').alias('h')
+  .command('init [options]','Command wrapper for git flow init').alias('i')
+  .command('log [options]','Command wrapper for git flow log').alias('l')
+  .command('release [options]','Command wrapper for git release').alias('r')
+  .command('support [options]','Command wrapper for git support').alias('s')
   .parse(process.argv);
\ No newline at end of file