diff --git a/update_amda/amda_clean_newmeta b/update_amda/amda_clean_newmeta index 7b0bb05..73a7d07 100755 --- a/update_amda/amda_clean_newmeta +++ b/update_amda/amda_clean_newmeta @@ -1,7 +1,12 @@ #!/bin/bash # - + CURRDIR=`pwd` + UPDATEDIR=$(dirname "$0") + + cd $UPDATEDIR ./updateAmda -c + + cd $CURRDIR diff --git a/update_amda/amda_generate_args b/update_amda/amda_generate_args index 97bc37a..98ff373 100755 --- a/update_amda/amda_generate_args +++ b/update_amda/amda_generate_args @@ -1,5 +1,11 @@ #!/bin/bash # Generate AMDA parameters args - + + CURRDIR=`pwd` + UPDATEDIR=$(dirname "$0") + + cd $UPDATEDIR ./updateAmda -a + + cd $CURRDIR diff --git a/update_amda/amda_install_all b/update_amda/amda_install_all index 728f474..5e1336b 100755 --- a/update_amda/amda_install_all +++ b/update_amda/amda_install_all @@ -3,10 +3,17 @@ # Complete AMDA Installation # if argv[1] is set - update SPASE Registry as well + CURRDIR=`pwd` + UPDATEDIR=$(dirname "$0") + + cd $UPDATEDIR + if [ $# -eq 0 ] then ./updateAmda -i -a -r else ./updateAmda -i -a -r -s fi + + cd $CURRDIR diff --git a/update_amda/amda_install_internal b/update_amda/amda_install_internal index 4d41b22..dfb3788 100755 --- a/update_amda/amda_install_internal +++ b/update_amda/amda_install_internal @@ -1,7 +1,11 @@ #!/bin/bash # - + CURRDIR=`pwd` + UPDATEDIR=$(dirname "$0") + + cd $UPDATEDIR + if [ $# -eq 0 ] then ./updateAmda -i @@ -9,3 +13,4 @@ ./updateAmda -i -s fi + cd $CURRDIR \ No newline at end of file diff --git a/update_amda/amda_install_internal_with-args b/update_amda/amda_install_internal_with-args index 24d856f..72106c9 100755 --- a/update_amda/amda_install_internal_with-args +++ b/update_amda/amda_install_internal_with-args @@ -1,6 +1,10 @@ #!/bin/bash # + CURRDIR=`pwd` + UPDATEDIR=$(dirname "$0") + + cd $UPDATEDIR if [ $# -eq 0 ] then @@ -9,3 +13,4 @@ ./updateAmda -i -a -s fi + cd $CURRDIR diff --git a/update_amda/amda_install_remote b/update_amda/amda_install_remote index c47ab7f..b471416 100755 --- a/update_amda/amda_install_remote +++ b/update_amda/amda_install_remote @@ -2,6 +2,13 @@ # Remote DataBases Installation/Updating + CURRDIR=`pwd` + UPDATEDIR=$(dirname "$0") + + cd $UPDATEDIR + ./updateAmda -r + + cd $CURRDIR diff --git a/update_amda/amda_update b/update_amda/amda_update index fddbefc..ff7c77a 100755 --- a/update_amda/amda_update +++ b/update_amda/amda_update @@ -1,11 +1,17 @@ #!/bin/bash # - + CURRDIR=`pwd` + UPDATEDIR=$(dirname "$0") + + cd $UPDATEDIR + if [ $# -eq 0 ] then ./updateAmda -u else ./updateAmda -u -s fi + + cd $CURRDIR diff --git a/update_amda/amda_update_args b/update_amda/amda_update_args index 42d3ceb..5f44408 100755 --- a/update_amda/amda_update_args +++ b/update_amda/amda_update_args @@ -2,4 +2,11 @@ # update AMDA parameters args : only non existing in NEWMETA/ParamInfo + CURRDIR=`pwd` + UPDATEDIR=$(dirname "$0") + + cd $UPDATEDIR + ./updateAmda -p + + cd $CURRDIR diff --git a/update_amda/amda_update_with-remote b/update_amda/amda_update_with-remote index 85471af..c6e87c6 100755 --- a/update_amda/amda_update_with-remote +++ b/update_amda/amda_update_with-remote @@ -1,11 +1,17 @@ #!/bin/bash # - + CURRDIR=`pwd` + UPDATEDIR=$(dirname "$0") + + cd $UPDATEDIR + if [ $# -eq 0 ] then ./updateAmda -u -r else ./updateAmda -u -r -s fi + + cd $CURRDIR diff --git a/update_amda/updateAmda b/update_amda/updateAmda index 816cbcc..97c9184 100755 --- a/update_amda/updateAmda +++ b/update_amda/updateAmda @@ -2,8 +2,9 @@ # --install | -i ; --update-internal | -u ; --with-remote | -r ; --generate-param-args | -a ; -update-param-args | -p ; # --spase-synchro | -s ; --clean-new-meta | -c ; --help | -h; - -. ./updateEnv.sh + + UPDATEDIR=`pwd`/$(dirname "$0") + . $UPDATEDIR/updateEnv.sh for option in $@ do @@ -55,8 +56,8 @@ then echo "cleaning in NEWMETA.." # cleanNewMetaLight - cleanNewMetaLight - cleanNewMetaParamInfo + $UPDATEDIR/cleanNewMetaLight + $UPDATEDIR/cleanNewMetaParamInfo echo "clean in NEWMETA : done" exit fi @@ -66,11 +67,11 @@ echo "Installing...." echo "cleaning in NEWMETA.." - cleanNewMetaLight + $UPDATEDIR/cleanNewMetaLight echo "clean in NEWMETA : done" echo "cleaning in AMDA_IHM/generic_data AMDA_Kernel/config..." - cleanExistingInstallation + $UPDATEDIR/cleanExistingInstallation echo "clean in AMDA_IHM/generic_data AMDA_Kernel/config : done" echo "making Amda From Spase..." @@ -83,15 +84,15 @@ echo "make Amda From Spase : done" echo "making Tree..." - php makeTree.php + php $UPDATEDIR/makeTree.php echo "make Tree : done" echo "copying 2 amda..." - ./cp2amda + $UPDATEDIR/cp2amda echo "copy 2 amda : done" echo "making Orbits..." - ./makeOrbits + $UPDATEDIR/makeOrbits echo "make Orbits : done" fi # Update StartStop only @@ -109,7 +110,7 @@ echo 'update in NEWMETA/dd_missions: done' echo "making Tree..." - php makeTree.php + php $UPDATEDIR/makeTree.php echo "make Tree : done" if [ -d $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData ] && [ -e ./LocalParams.xml ] @@ -128,7 +129,7 @@ echo "Generating param info...." if [ $CLEAN_ARGS ]; then - cleanNewMetaParamInfo + $UPDATEDIR/cleanNewMetaParamInfo fi generate_param_info @@ -148,7 +149,7 @@ if [ $REMOTE ] then echo "making Remote" - ./makeRemote + $UPDATEDIR/makeRemote echo "make Remote : done" fi \ No newline at end of file -- libgit2 0.21.2