X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FDEPLOY.sh;h=bc76bbdd70d51cee17071ed27f1fc6816642be94;hb=659d6188ba2150517f42a8a61699b42eb9c5f1c7;hp=e4593be17d38cd632d4f0d91aa0af6e5efc1336f;hpb=0bfa966ffd9db550a64fd5445a4d9c1082739416;p=anna.git

diff --git a/example/diameter/launcher/DEPLOY.sh b/example/diameter/launcher/DEPLOY.sh
old mode 100644
new mode 100755
index e4593be..bc76bbd
--- a/example/diameter/launcher/DEPLOY.sh
+++ b/example/diameter/launcher/DEPLOY.sh
@@ -1,12 +1,13 @@
-#!/bin/ksh
+#!/bin/bash
 
 # Functions & variables
 SETUPS_DIR=../../../source/diameter/stack/setups
 MSGDTD=../../../include/anna/diameter/codec/message.dtd
 DCTDTD=../../../include/anna/diameter/stack/dictionary.dtd
 BASE_PROT=commands_baseProtocol.xml
-EXEC=/opt/bin/anna/example_diameter_launcher
+EXEC=./debug/example_diameter_launcher
 DPATH_dflt=$HOME/ADL
+RESOURCES_DIR=resources
 
 _exit () {
    echo
@@ -17,13 +18,13 @@ _exit () {
 
 createRunScript () {
 
-  echo "#!/bin/ksh" > run.sh
+  echo "#!/bin/bash" > run.sh
   echo "EXE=\`cat .exe 2>/dev/null\`" >> run.sh
   echo "STARTED=\`ps -fea | grep \"\$EXE\" | grep -v grep\`" >> run.sh
   echo "[ \"\$EXE\" != \"\" -a \"\$STARTED\" != \"\" ] && { echo \"Already started!\"; echo \"\$STARTED\" ; exit ; }" >> run.sh
-  echo "pre-start.sh" >> run.sh
+  echo "./pre-start.sh" >> run.sh
   echo "> launcher.traces" >> run.sh
-  echo "EXE=\"ADL-launcher\"" >> run.sh
+  echo "EXE=\"./ADL-launcher\"" >> run.sh
   echo "echo \$EXE > .exe"  >> run.sh
   echo >> run.sh
   echo -n "\$EXE " >> run.sh
@@ -38,8 +39,7 @@ createRunScript () {
 
 createDictionaryPaths () {
 
-
-for i in stacks/*commands*xml
+  for i in stacks/*commands*xml
   do
     stacks/dependence.sh $i >/dev/null
     stack=`basename $i`
@@ -56,6 +56,9 @@ for i in stacks/*commands*xml
 
   # Default:
   ln -s .dictionary__commands_qosControl.xml .dictionary
+
+  # Remove deps:
+  rm -f stacks/*.dep
 }
 
 #############
@@ -72,30 +75,38 @@ read DPATH
 [[ -d $DPATH ]] && _exit "The path '$DPATH' already exists. Remove it before continue..."
 
 echo "Basic checkings ..."
-[[ ! -f $EXEC ]] && _exit "Anna Diameter Launcher (ADL) is not installed in the system. Execute 'sudo scons install' for 'anna' suite."
+[[ ! -f $EXEC ]] && _exit "Anna Diameter Launcher (ADL) is not linked. Execute 'scons' for 'anna' suite."
 [[ ! -d $SETUPS_DIR ]] && _exit "Diameter stacks not found ($SETUPS_DIR). Perhaps you executed this script out of its parent path."
 
+echo
+echo "Deploy (f)ull version or (l)ite version [l]:"
+read deploy_type
+[[ "$deploy_type" = "" ]] && deploy_type=l
+[[ "$deploy_type" = "l" ]] && RESOURCES_DIR=resources_lite
+
 echo "Copying ..."
 mkdir -p $DPATH
 mkdir -p $DPATH/stacks
+mkdir -p $DPATH/DTDs
 cp $EXEC $DPATH/ADL-launcher
-cp resources/* $DPATH
+cp -r $RESOURCES_DIR/* $DPATH
 cp $SETUPS_DIR/*xml $DPATH/stacks
 cp $SETUPS_DIR/*sh $DPATH/stacks
-cp $MSGDTD $DPATH
-cp $DCTDTD $DPATH
+cp $SETUPS_DIR/readme.txt $DPATH/stacks
+cp $MSGDTD $DPATH/DTDs
+cp $DCTDTD $DPATH/DTDs
 
 echo "Preparing ..."
 cd $DPATH
-createRunScript
+[[ "$deploy_type" != "l" ]] && createRunScript
 createDictionaryPaths
 cd - >/dev/null
 
 # Help:
 echo
-echo "Stacks available at '.dictionary__<stack description>', create a symbolic link from '.dictionary'."
-echo "That link points now to an QoS application dictionary. Template for xml messages (message.dtd) and"
-echo " dictionaries (dictionary.dtd) are informative, not actually required by process. Start with 'run.sh'."
+echo "Go to '$DPATH' and see README file"
+echo
+echo "Done!"
 echo
 echo