Merge pull request #161 from nobodyiam/cd_portal_scripts

change scripts dir

apollo-adminservice/src/assembly/assembly-descriptor.xml

@@ -11,7 +11,7 @@
 		<!--scripts -->
 		<fileSet>
 			<directory>src/main/scripts</directory>
-			<outputDirectory>bin</outputDirectory>
+			<outputDirectory>scripts</outputDirectory>
 			<includes>
 				<include>*.sh</include>
 			</includes>
@@ -44,4 +44,4 @@
 			<fileMode>0755</fileMode>
 		</fileSet>
 	</fileSets>
-</assembly>
+</assembly>
\ No newline at end of file

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
+wait
\ No newline at end of file

apollo-configservice/src/assembly/assembly-descriptor.xml

@@ -11,7 +11,7 @@
 		<!--scripts -->
 		<fileSet>
 			<directory>src/main/scripts</directory>
-			<outputDirectory>bin</outputDirectory>
+			<outputDirectory>scripts</outputDirectory>
 			<includes>
 				<include>*.sh</include>
 			</includes>
@@ -44,4 +44,4 @@
 			<fileMode>0755</fileMode>
 		</fileSet>
 	</fileSets>
-</assembly>
+</assembly>
\ No newline at end of file

apollo-portal/src/assembly/assembly-descriptor.xml

@@ -11,7 +11,7 @@
 		<!--scripts -->
 		<fileSet>
 			<directory>src/main/scripts</directory>
-			<outputDirectory>bin</outputDirectory>
+			<outputDirectory>scripts</outputDirectory>
 			<includes>
 				<include>*.sh</include>
 			</includes>
@@ -44,4 +44,4 @@
 			<fileMode>0755</fileMode>
 		</fileSet>
 	</fileSets>
-</assembly>
+</assembly>
\ No newline at end of file