Update jenkins build script

voole · May 17, 2016 · 0702ffc · 0702ffc
1 parent 3cef854
commit 0702ffc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/apollo-assembly/src/main/resources/META-INF/app.properties b/apollo-assembly/src/main/resources/META-INF/app.properties
@@ -0,0 +1,2 @@
+app.id=100003171
+jdkVersion=1.8
diff --git a/apollo-buildtools/src/main/scripts/deploy_jenkins.sh b/apollo-buildtools/src/main/scripts/deploy_jenkins.sh
@@ -30,6 +30,7 @@ APP_RELEASE_DIR=$APP_BASE_DIR/apollo-$APP_NAME.releases/`date "+%Y-%m-%d.%H.%M.%
 APP_STARTUP_SCRIPT=$APP_DIR/scripts/startup.sh
 APP_SHUTDOWN_SCRIPT=$APP_DIR/scripts/shutdown.sh
 
+chmod +x $APP_SHUTDOWN_SCRIPT
 if [ -e $APP_STARTUP_SCRIPT ];then
 	$APP_SHUTDOWN_SCRIPT
 fi
@@ -43,7 +44,5 @@ fi
 ln -s $APP_RELEASE_DIR $APP_DIR
 
 chmod +x $APP_STARTUP_SCRIPT
-chmod +x $APP_SHUTDOWN_SCRIPT
-$APP_SHUTDOWN_SCRIPT 
 $APP_STARTUP_SCRIPT
 wait