Merge pull request patternfly#425 from dlabrecq/PTNFLY-release

Removed -B switch from git checkout.

Author: dlabrecq

scripts/release.sh

@@ -76,6 +76,11 @@ clean()
   if [ -d components ]; then
     rm -rf components
   fi
+
+  # shrinkwrap
+  if [ -s $SHRINKWRAP_JSON ]; then
+    rm -f $SHRINKWRAP_JSON
+  fi
 }
 
 # Install dependencies
@@ -136,7 +141,10 @@ setup_repo() {
   git clone $PTNFLY_REPO
   cd $PTNFLY_DIR
 
-  git checkout -B $BRANCH
+  git checkout $BRANCH
+  if [ "$?" -ne 0 ]; then
+    git checkout -B $BRANCH
+  fi
   check $? "Local repo setup failure"
 }
 
@@ -146,11 +154,6 @@ shrinkwrap()
   echo "*** Shrink wrapping $SHRINKWRAP_JSON"
   cd $PTNFLY_DIR
 
-  # shrinkwrap
-  if [ -s $SHRINKWRAP_JSON ]; then
-    rm -f $SHRINKWRAP_JSON
-  fi
-
   npm shrinkwrap
   check $? "npm shrinkwrap failure"
 }