X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FDEPLOY_setups.sh;h=dab557dd39e99d4cf6f2cb49465c49a0d9fd09d3;hb=61f1340da3cae5159d2e3bc14fc47c6d4bf9453e;hp=ff555495690f6132af38e3b7c74b12dea7d058d0;hpb=8de835b706e08eac4bb8fca78c1f373bfb29191f;p=anna.git

diff --git a/example/diameter/launcher/DEPLOY_setups.sh b/example/diameter/launcher/DEPLOY_setups.sh
index ff55549..dab557d 100755
--- a/example/diameter/launcher/DEPLOY_setups.sh
+++ b/example/diameter/launcher/DEPLOY_setups.sh
@@ -18,26 +18,44 @@ _exit() {
 #############
 # EXECUTION #
 #############
+type=$1
+target=$2
+
+echo
+echo "               ----------------------------"
+echo "               SETUPS DEPLOYMENT AUTOMATION"
+echo "               ----------------------------"
+echo
+echo "-----------------------------------------------------------"
+echo "Usage: $0 [type] [target_directory]"
+echo
+echo "          type:"
+echo "                1. Client and server"
+echo "                2. Ft-client and server"
+echo "                3. St-client and servers"
+echo
+echo "          target_directory:"
 echo
-echo "Which one you want to deploy [1]:"
+echo "                Non existing directory to install the stuff"
 echo
-echo "   1. Client and server"
-echo "   2. Ft-client and server"
-echo "   3. St-client and servers"
+echo "-----------------------------------------------------------"
 echo
-read type
+[ "$type" = "" ] && { echo "Which one you want to deploy [1]:" ; read type ; }
 [ "$type" = "" ] && type=1
 
 case $type in
   1)
+    echo "Selected Client-Server"
     DEPLOY_DIR__dflt=$HOME/ADML-clientAndServer
   ;;
 
   2)
+    echo "Selected Client-Server FT"
     DEPLOY_DIR__dflt=$HOME/ADML-ftclientAndServer
   ;;
 
   3)
+    echo "Selected Client-Servers ST"
     DEPLOY_DIR__dflt=$HOME/ADML-stclientAndServers
   ;;
 
@@ -46,55 +64,58 @@ case $type in
     exit 1
   ;;
 esac
-
 echo
-echo "Directory for deploy [$DEPLOY_DIR__dflt]:"
-read DIR
-[ "$DIR" = "" ] && DIR=$DEPLOY_DIR__dflt
-[ -d $DIR ] && _exit "The directory '$DIR' already exists !"
+
+
+[ "$target" = "" ] && { echo "Directory for deploy [$DEPLOY_DIR__dflt]:" ; read target ; }
+[ "$target" = "" ] && target=$DEPLOY_DIR__dflt
+[ -d $target ] && _exit "The directory '$target' already exists !"
+echo "Target directory: $target"
 
 case $type in
   1)
-    $DEPLOY_SCR b $DIR/ADML-client
-    $DEPLOY_SCR b $DIR/ADML-server
+    $DEPLOY_SCR b $target/ADML-client
+    $DEPLOY_SCR b $target/ADML-server
     echo "Configuring ..."
-    cd $DIR/ADML-client
+    cd $target/ADML-client
     echo c | ./configure.sh >/dev/null
     cd - >/dev/null
-    cd $DIR/ADML-server
+    cd $target/ADML-server
     echo s | ./configure.sh >/dev/null
     cd - >/dev/null
   ;;
 
   2)
-    $DEPLOY_SCR f $DIR/ADML-ft-client
-    $DEPLOY_SCR b $DIR/ADML-server
+    $DEPLOY_SCR f $target/ADML-ft-client
+    $DEPLOY_SCR b $target/ADML-server
     echo "Configuring ..."
-    cd $DIR/ADML-server
+    cd $target/ADML-server
     echo s | ./configure.sh >/dev/null
     cd - >/dev/null
   ;;
 
   3)
-    $DEPLOY_SCR s $DIR/ADML-st-client
-    $DEPLOY_SCR b $DIR/ADML-serverGx
-    $DEPLOY_SCR b $DIR/ADML-serverRx
+    $DEPLOY_SCR s $target/ADML-st-client
+    $DEPLOY_SCR b $target/ADML-serverGx
+    $DEPLOY_SCR b $target/ADML-serverRx
     echo "Configuring ..."
-    cd $DIR/ADML-st-client
-    ln -s realms_example realms
-    mv run.sh .run-one.sh
-    mv run_all.sh run.sh
-    mv operation.sh .operation-one.sh
-    mv operation_all.sh operation.sh
-    rm dictionary.xml
-    cd - >/dev/null
-    cd $DIR/ADML-serverGx
+#    cd $target/ADML-st-client
+#    ln -s services_example services
+#    mv run.sh .run-one.sh
+#    mv run_all.sh run.sh
+#    mv operation.sh .operation-one.sh
+#    mv operation_all.sh operation.sh
+#    rm dictionary.xml
+#    cd - >/dev/null
+    cd $target/ADML-serverGx
     echo s | ./configure.sh >/dev/null
     sed -i 's/3868/3869/' services.xml
+    # Gx dictionary:
     ln -sf stacks/other_examples/16777238.xml dictionary.xml
     cd - >/dev/null
-    cd $DIR/ADML-serverRx
+    cd $target/ADML-serverRx
     echo s | ./configure.sh >/dev/null
+    # Rx dictionary:
     ln -sf stacks/other_examples/16777236.xml dictionary.xml
     cd - >/dev/null
   ;;