Commit 9ad25dcab87b4dbca8fbadf5abb63f6592ef4860
1 parent
f758a319
Exists in
master
and in
112 other branches
relative path
Showing
10 changed files
with
72 additions
and
17 deletions
Show diff stats
update_amda/amda_clean_newmeta
update_amda/amda_generate_args
update_amda/amda_install_all
... | ... | @@ -3,10 +3,17 @@ |
3 | 3 | # Complete AMDA Installation |
4 | 4 | # if argv[1] is set - update SPASE Registry as well |
5 | 5 | |
6 | + CURRDIR=`pwd` | |
7 | + UPDATEDIR=$(dirname "$0") | |
8 | + | |
9 | + cd $UPDATEDIR | |
10 | + | |
6 | 11 | if [ $# -eq 0 ] |
7 | 12 | then |
8 | 13 | ./updateAmda -i -a -r |
9 | 14 | else |
10 | 15 | ./updateAmda -i -a -r -s |
11 | 16 | fi |
17 | + | |
18 | + cd $CURRDIR | |
12 | 19 | |
... | ... |
update_amda/amda_install_internal
update_amda/amda_install_internal_with-args
update_amda/amda_install_remote
update_amda/amda_update
update_amda/amda_update_args
update_amda/amda_update_with-remote
update_amda/updateAmda
... | ... | @@ -2,8 +2,9 @@ |
2 | 2 | |
3 | 3 | # --install | -i ; --update-internal | -u ; --with-remote | -r ; --generate-param-args | -a ; -update-param-args | -p ; |
4 | 4 | # --spase-synchro | -s ; --clean-new-meta | -c ; --help | -h; |
5 | - | |
6 | -. ./updateEnv.sh | |
5 | + | |
6 | + UPDATEDIR=`pwd`/$(dirname "$0") | |
7 | + . $UPDATEDIR/updateEnv.sh | |
7 | 8 | |
8 | 9 | for option in $@ |
9 | 10 | do |
... | ... | @@ -55,8 +56,8 @@ |
55 | 56 | then |
56 | 57 | echo "cleaning in NEWMETA.." |
57 | 58 | # cleanNewMetaLight |
58 | - cleanNewMetaLight | |
59 | - cleanNewMetaParamInfo | |
59 | + $UPDATEDIR/cleanNewMetaLight | |
60 | + $UPDATEDIR/cleanNewMetaParamInfo | |
60 | 61 | echo "clean in NEWMETA : done" |
61 | 62 | exit |
62 | 63 | fi |
... | ... | @@ -66,11 +67,11 @@ |
66 | 67 | echo "Installing...." |
67 | 68 | |
68 | 69 | echo "cleaning in NEWMETA.." |
69 | - cleanNewMetaLight | |
70 | + $UPDATEDIR/cleanNewMetaLight | |
70 | 71 | echo "clean in NEWMETA : done" |
71 | 72 | |
72 | 73 | echo "cleaning in AMDA_IHM/generic_data AMDA_Kernel/config..." |
73 | - cleanExistingInstallation | |
74 | + $UPDATEDIR/cleanExistingInstallation | |
74 | 75 | echo "clean in AMDA_IHM/generic_data AMDA_Kernel/config : done" |
75 | 76 | |
76 | 77 | echo "making Amda From Spase..." |
... | ... | @@ -83,15 +84,15 @@ |
83 | 84 | echo "make Amda From Spase : done" |
84 | 85 | |
85 | 86 | echo "making Tree..." |
86 | - php makeTree.php | |
87 | + php $UPDATEDIR/makeTree.php | |
87 | 88 | echo "make Tree : done" |
88 | 89 | |
89 | 90 | echo "copying 2 amda..." |
90 | - ./cp2amda | |
91 | + $UPDATEDIR/cp2amda | |
91 | 92 | echo "copy 2 amda : done" |
92 | 93 | |
93 | 94 | echo "making Orbits..." |
94 | - ./makeOrbits | |
95 | + $UPDATEDIR/makeOrbits | |
95 | 96 | echo "make Orbits : done" |
96 | 97 | fi |
97 | 98 | # Update StartStop only |
... | ... | @@ -109,7 +110,7 @@ |
109 | 110 | echo 'update in NEWMETA/dd_missions: done' |
110 | 111 | |
111 | 112 | echo "making Tree..." |
112 | - php makeTree.php | |
113 | + php $UPDATEDIR/makeTree.php | |
113 | 114 | echo "make Tree : done" |
114 | 115 | |
115 | 116 | if [ -d $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData ] && [ -e ./LocalParams.xml ] |
... | ... | @@ -128,7 +129,7 @@ |
128 | 129 | echo "Generating param info...." |
129 | 130 | |
130 | 131 | if [ $CLEAN_ARGS ]; then |
131 | - cleanNewMetaParamInfo | |
132 | + $UPDATEDIR/cleanNewMetaParamInfo | |
132 | 133 | fi |
133 | 134 | |
134 | 135 | generate_param_info |
... | ... | @@ -148,7 +149,7 @@ |
148 | 149 | if [ $REMOTE ] |
149 | 150 | then |
150 | 151 | echo "making Remote" |
151 | - ./makeRemote | |
152 | + $UPDATEDIR/makeRemote | |
152 | 153 | echo "make Remote : done" |
153 | 154 | fi |
154 | 155 | |
155 | 156 | \ No newline at end of file |
... | ... |