Merge "Update package prepare scripts"

[bottlenecks.git] / rubbos / rubbos_scripts / 1-1-1 / scripts / TOMCAT1_pkg_prepare.sh

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
index ac5231e..b2aacea 100755 (executable)
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
@@ -11,15 +11,6 @@ scp $scp_options ../set_bottlenecks_rubbos_env.sh $TOMCAT1_HOST:/bottlenecks/rub
 
 ssh $TOMCAT1_HOST "mkdir -p $SOFTWARE_HOME"
 
-ssh $TOMCAT1_HOST "
-    apt-get update
-    apt-get install -y \
-        gcc \
-        gettext \
-        g++ \
-        make
-"
-
 for i in $TOMCAT_TARBALL $JAVA_TARBALL $J2EE_TARBALL $ANT_TARBALL
 do
     scp $scp_options $SOFTWARE_HOME/$i $TOMCAT1_HOST:$SOFTWARE_HOME/$i
@@ -39,7 +30,7 @@ fi
 # Packages for TOMCAT1 configure
 if true; then
 ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/tomcat_conf"
-scp $scp_options $OUTPUT_HOME/tomcat_conf/server.xml-$HOSTNAME $TOMCAT1_HOST:$OUTPUT_HOME/tomcat_conf/server.xml-$HOSTNAME
+scp $scp_options $OUTPUT_HOME/tomcat_conf/server.xml $TOMCAT1_HOST:$OUTPUT_HOME/tomcat_conf/server.xml
 fi
 
 # Packages for TOMCAT1 rubbosSL configure