Update benchmark and clientx scripts

just to make xx_install.sh xx_uninstall.sh ... the same.

rewrite the scripts latter or delete duplicated code if needed.

Change-Id: I0bcb993ef5ad9a5abb6b2ed009c7e6ed1b29e1ce
JIRA:BOTTLENECK-24
Signed-off-by: QiLiang <liangqi1@huawei.com>

11 files changed, 35 insertions, 9 deletions

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
index 7557854d..e7571120 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
@@ -12,4 +12,4 @@ fi
 
 tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
 
-echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME" 
+echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
index 4cec4efa..2a9a115a 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
@@ -4,4 +4,4 @@ cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
 source set_bottlenecks_rubbos_env.sh
 
 rm -rf $JAVA_HOME
-#rm -rf $ELBA_TOP 
+#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
index 3be98dea..e7571120 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
@@ -5,8 +5,11 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
+mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
+
 tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
 
 echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
- 
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
index 2b684164..098df714 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
@@ -5,7 +5,10 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
 mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
 
 # install RUBBoS
 tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
index 00943e3c..96a51df7 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
@@ -7,4 +7,4 @@ cd $SYSSTAT_HOME
 sudo make uninstall
 sudo rm -rf $SYSSTAT_HOME
 rm -rf $RUBBOS_HOME
-rm -rf $ELBA_TOP
+#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
index 3be98dea..e7571120 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
@@ -5,8 +5,11 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
+mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
+
 tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
 
 echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
- 
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
index 2b684164..098df714 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
@@ -5,7 +5,10 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
 mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
 
 # install RUBBoS
 tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
index ec47699a..e7571120 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
@@ -5,6 +5,11 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
+mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
+
 tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
 
 echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
index 2b684164..098df714 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
@@ -5,7 +5,10 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
 mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
 
 # install RUBBoS
 tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
index 3be98dea..e7571120 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
@@ -5,8 +5,11 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
+mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
+
 tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
 
 echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
- 
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
index 2b684164..098df714 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
@@ -5,7 +5,10 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
 mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
 
 # install RUBBoS
 tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP