瀏覽代碼

improve release script

Adam Shaw 11 年之前
父節點
當前提交
4be161f99f
共有 3 個文件被更改,包括 16 次插入9 次删除
  1. 13 7
      build/release.sh
  2. 1 0
      build/watch.sh
  3. 2 2
      package.json

+ 13 - 7
build/release.sh

@@ -6,20 +6,26 @@ read -p "Enter the new version number with no 'v' (for example '1.0.1'): " versi
 
 if [[ ! "$version" ]]
 then
-	exit;
+	exit
 fi
 
 grunt bump --setversion=$version && \
 grunt dist && \
 npm run-script no-assume-unchanged && \
-git add *.json && \
 git add -f dist/*.js dist/*.css dist/lang/*.js && \
+git add *.json && \
 git commit -e -m "version $version" && \
-git tag -a v$version -m "version $version" && \
-echo && \
-echo 'DONE. It is now up to you to run `'"git push origin master && git push origin v$version"'`' && \
-echo
+git tag -a v$version -m "version $version"
+
+status=$?
 
 # regardless of error/success, undo the temporary no-assume-unchanged
 git reset
-npm run-script assume-unchanged
+npm run-script assume-unchanged
+
+if [ $status -eq 0 ]
+then
+	echo
+	echo 'DONE. It is now up to you to run `'"git push origin master && git push origin v$version"'`'
+	echo
+fi

+ 1 - 0
build/watch.sh

@@ -2,4 +2,5 @@
 
 cd "`dirname $0`/.."
 
+npm run-script assume-unchanged
 grunt lumbar:watch

+ 2 - 2
package.json

@@ -22,10 +22,10 @@
     "karma-phantomjs-launcher": "^0.1.4"
   },
   "scripts": {
-    "install": "bower install && npm run-script assume-unchanged",
+    "install": "bower install; npm run-script assume-unchanged",
     "preuninstall": "npm run-script no-assume-unchanged",
     "assume-unchanged": "git update-index --assume-unchanged dist/*.js dist/*.css dist/lang/*.js",
     "no-assume-unchanged": "git update-index --no-assume-unchanged dist/*.js dist/*.css dist/lang/*.js",
-    "list-assume-unchanged": "git ls-files -v|grep '^h'"
+    "list-assume-unchanged": "git ls-files -v | grep '^h'"
   }
 }