Merge pull request #59 from imsky/safety-checks

add safety checks before running git-fresh

git-fresh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+# git-fresh
+# https://github.com/imsky/git-fresh
+# By Ivan Malopinsky - http://imsky.co
+# MIT License
+
 usage () {
 cat << EOD
 Usage: git fresh [-fmrF] [-sl] [remote] [root]
@@ -20,11 +25,17 @@ remote: remote name, origin by default
 root: root branch, master by default
 EOD
 
-exit 0;
+exit 0
 }
 
 error () {
-  echo -n "[git-fresh] error on line $1"
+  echo "[git-fresh] error on line $1"
+  exit 1
+}
+
+die () {
+  echo "[git-fresh] $@" 1>&2
+  exit 1
 }
 
 trap 'error $LINENO' ERR
@@ -58,6 +69,9 @@ done
 
 shift $((OPTIND-1))
 
+[[ ! -e .git ]] && die "Not a git repository"
+[[ $(ls -l .git/refs/heads | wc -l) -eq "1" ]] && die "No HEAD ref available"
+
 CURRENT=$(git rev-parse --abbrev-ref HEAD)
 REMOTE=${1:-origin}
 ROOT=${2:-master}

install

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-INSTALL_DIR=${INSTALL_DIR:-/usr/local/bin}
+INSTALL_DIR=${1:-/usr/local/bin}
 
-cp git-fresh $INSTALL_DIR
-[ -e $INSTALL_DIR/git-fresh ] && echo git-fresh installed in $INSTALL_DIR
+mkdir -p $INSTALL_DIR
+cp git-fresh $INSTALL_DIR && ([ -e $INSTALL_DIR/git-fresh ] && echo git-fresh installed in $INSTALL_DIR)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-fresh",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Utility to keep Git repositories fresh",
   "global": true,
   "repo": "imsky/git-fresh",