From f1a8d419d529ced136441d0eae5f4dd474a8c8ff Mon Sep 17 00:00:00 2001
From: Brian Ford
Date: Wed, 11 Dec 2013 14:27:23 -0800
Subject: chore(scripts): fix bower script to pull from master before updating

---
 scripts/bower/publish.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'scripts/bower/publish.sh')

diff --git a/scripts/bower/publish.sh b/scripts/bower/publish.sh
index 7420257c..3575e8e8 100755
--- a/scripts/bower/publish.sh
+++ b/scripts/bower/publish.sh
@@ -33,8 +33,10 @@ REPOS=(
 # download and unzip the file
 #
 
-#wget $ZIP_FILE_URL
-unzip $ZIP_FILE
+if [ ! -f $ZIP_FILE ]; then
+  wget $ZIP_FILE_URL
+  unzip $ZIP_FILE
+fi
 
 
 #
@@ -46,8 +48,10 @@ do
   if [ -f $ZIP_DIR/$repo.js ] # ignore i18l
     then
       cd bower-$repo
-      git checkout master
       git reset --hard HEAD
+      git checkout master
+      git fetch --all
+      git reset --hard origin/master
       cd ..
       mv $ZIP_DIR/$repo.* bower-$repo/
   fi
@@ -76,7 +80,6 @@ echo $NEW_VERSION
 for repo in "${REPOS[@]}"
 do
   cd bower-$repo
-  pwd
   sed -i '' -e "s/$OLD_VERSION/$NEW_VERSION/g" bower.json
   git add -A
   git commit -m "v$NEW_VERSION"
-- 
cgit v1.2.3