Chromium Code Reviews| Index: appengine/findit/util_scripts/run.sh |
| diff --git a/appengine/findit/util_scripts/run.sh b/appengine/findit/util_scripts/run.sh |
| index a5f46ccaa8303fa770350aad291d4d9c76bbdc02..8d3035108005dd2fe0b8668fc86186d4db382f4a 100755 |
| --- a/appengine/findit/util_scripts/run.sh |
| +++ b/appengine/findit/util_scripts/run.sh |
| @@ -48,44 +48,18 @@ deploy_findit() { |
| local app_id="findit-for-waterfall" |
| if [[ "$1" == "prod" ]]; then |
| app_id="findit-for-me" |
| - local update_log="$TMP_DIR/update.log" |
| - echo "Syncing code to tip of tree, logging in $update_log ..." |
| - local update="$(cd $INFRA_DIR && git pull >>$update_log 2>>$update_log && gclient sync >>$update_log 2>>$update_log && echo $?)" |
| - if [[ "$update" != "0" ]]; then |
| - echo "Failed to run 'git pull && gclient sync'!" |
| - echo "Please check log at $update_log" |
| - return |
| - fi |
| - echo "Code was synced successfully." |
|
qyearsley
2016/01/17 03:43:12
Are the changes in run.sh related to the other cha
chanli
2016/01/20 18:07:08
Sorry. There should be no change on run.sh...
|
| fi |
| local current_version=`curl -s https://${app_id}.appspot.com/version` |
| if ! [[ $current_version =~ ^[0-9a-fA-F]+$ ]]; then |
| + echo $current_version |
| echo "Failed to retrieve current version of Findit from the live app." |
| echo "Please input the current version, followed by [ENTER]:" |
| read current_version |
| + echo |
| fi |
| - echo "Current deployed version is $current_version" |
| local new_version="$(git rev-parse --short HEAD)" |
| - if [[ "$1" == "prod" ]]; then |
| - # Check uncommitted local changes. |
| - local changed_file_number="$(git status --porcelain | wc -l)" |
| - if [[ "$changed_file_number" != "0" ]]; then |
| - echo "You have uncommitted local changes!" |
| - echo "Please run 'git status' to check local changes." |
| - return |
| - fi |
| - |
| - # Check committed local changes. |
| - local tot_version="$(git rev-parse --short origin/master)" |
| - if [[ "$new_version" != "$tot_version" ]]; then |
| - echo "You have local commits!" |
| - echo "Please run 'git reset $tot_version' to reset the local changes." |
| - return |
| - fi |
| - fi |
| - |
| local app_cfg="${GOOGLE_APP_ENGINE_DIR}/appcfg.py" |
| echo "Current deployed version is '$current_version'." |