diff --git a/apollo-adminservice/src/assembly/assembly-descriptor.xml b/apollo-adminservice/src/assembly/assembly-descriptor.xml index bd648738d0962ba9f484fbecf8c4f9693873d1a8..48aef241c04bb6da734ec3a901cd3903567ed431 100644 --- a/apollo-adminservice/src/assembly/assembly-descriptor.xml +++ b/apollo-adminservice/src/assembly/assembly-descriptor.xml @@ -11,7 +11,7 @@ src/main/scripts - bin + scripts *.sh @@ -44,4 +44,4 @@ 0755 - \ No newline at end of file + diff --git a/apollo-buildtools/src/main/scripts/deploy_jenkins.sh b/apollo-buildtools/src/main/scripts/deploy_jenkins.sh index 1694cbd88816c936621a875957e58b7d636ae64d..6aa74ee909ce6015c8f622e3e9ba6497c0ae5290 100644 --- a/apollo-buildtools/src/main/scripts/deploy_jenkins.sh +++ b/apollo-buildtools/src/main/scripts/deploy_jenkins.sh @@ -27,8 +27,8 @@ APP_BASE_DIR=/opt/ctrip/app APP_NAME=$1 APP_DIR=$APP_BASE_DIR/$APP_NAME APP_RELEASE_DIR=$APP_BASE_DIR/apollo-$APP_NAME.releases/`date "+%Y-%m-%d.%H.%M.%S"` -APP_STARTUP_SCRIPT=$APP_DIR/bin/startup.sh -APP_SHUTDOWN_SCRIPT=$APP_DIR/bin/shutdown.sh +APP_STARTUP_SCRIPT=$APP_DIR/scripts/startup.sh +APP_SHUTDOWN_SCRIPT=$APP_DIR/scripts/shutdown.sh if [ -e $APP_STARTUP_SCRIPT ];then $APP_SHUTDOWN_SCRIPT @@ -46,4 +46,4 @@ chmod +x $APP_STARTUP_SCRIPT chmod +x $APP_SHUTDOWN_SCRIPT $APP_SHUTDOWN_SCRIPT $APP_STARTUP_SCRIPT -wait \ No newline at end of file +wait diff --git a/apollo-configservice/src/assembly/assembly-descriptor.xml b/apollo-configservice/src/assembly/assembly-descriptor.xml index bf173d751b129107802199857c8176b2a22fd60b..973a509a71943310790fdbf537d9e7d56d7d4e7f 100644 --- a/apollo-configservice/src/assembly/assembly-descriptor.xml +++ b/apollo-configservice/src/assembly/assembly-descriptor.xml @@ -11,7 +11,7 @@ src/main/scripts - bin + scripts *.sh @@ -44,4 +44,4 @@ 0755 - \ No newline at end of file + diff --git a/apollo-portal/src/assembly/assembly-descriptor.xml b/apollo-portal/src/assembly/assembly-descriptor.xml index 33c8932cac0746da3652a9d83a88312604852c1c..233c6a58e4a2a9ad79b6923d8aca1c643db123b5 100644 --- a/apollo-portal/src/assembly/assembly-descriptor.xml +++ b/apollo-portal/src/assembly/assembly-descriptor.xml @@ -11,7 +11,7 @@ src/main/scripts - bin + scripts *.sh @@ -44,4 +44,4 @@ 0755 - \ No newline at end of file +