Commit d23bf7c6c2addca48730c397caafcf2bebdc76de
1 parent
794d9d2d
Exists in
master
and in
107 other branches
modify param properties in any case
Showing
1 changed file
with
37 additions
and
34 deletions
Show diff stats
update_amda/generate_param_info
| @@ -35,7 +35,8 @@ do | @@ -35,7 +35,8 @@ do | ||
| 35 | 35 | ||
| 36 | if [ -e $PARAM_INFO_PATH/$info_file ] | 36 | if [ -e $PARAM_INFO_PATH/$info_file ] |
| 37 | then | 37 | then |
| 38 | - echo ${param_filename} exists | 38 | + #echo ${param_filename} exists |
| 39 | + temp=a | ||
| 39 | else | 40 | else |
| 40 | echo "Generate info file for ${param_filename}" | 41 | echo "Generate info file for ${param_filename}" |
| 41 | php $UPDATEDIR/preprocessInfo.php ${param_filename} | 42 | php $UPDATEDIR/preprocessInfo.php ${param_filename} |
| @@ -48,39 +49,40 @@ if [ ! -e ./app.properties ]; then | @@ -48,39 +49,40 @@ if [ ! -e ./app.properties ]; then | ||
| 48 | exit | 49 | exit |
| 49 | fi | 50 | fi |
| 50 | 51 | ||
| 51 | -if [ -e ./app.properties.temp ]; then | ||
| 52 | - # rm ./app.properties.temp | ||
| 53 | - echo "Seems ./app.properties has been modified already" | ||
| 54 | -else | ||
| 55 | - while read line | ||
| 56 | - do | ||
| 57 | - | ||
| 58 | - if [[ $line == app.param.path* ]]; then | ||
| 59 | - line="app.param.path="$NEWMETA"final/" | ||
| 60 | - fi | ||
| 61 | - | ||
| 62 | - if [[ $line == app.dataSetInfo.path* ]]; then | ||
| 63 | - line="app.dataSetInfo.path="$NEWMETA"datasets/" | ||
| 64 | - fi | ||
| 65 | - | ||
| 66 | - if [[ $line == app.user.name* ]]; then | ||
| 67 | - line="app.user.name="$DDUSER | ||
| 68 | - fi | ||
| 69 | - | ||
| 70 | - if [[ $line == app.plugin* ]]; then | ||
| 71 | - line="app.plugin=./../build/"$KERNEL_BUILD_TYPE"/plugin/" | ||
| 72 | - fi | ||
| 73 | - | ||
| 74 | - if [[ $line == app.process.LIB* ]]; then | ||
| 75 | - line="app.process.LIB=-L../build/"$KERNEL_BUILD_TYPE"/lib/ -lParameters" | ||
| 76 | - fi | ||
| 77 | - | ||
| 78 | - echo $line >> ./app.properties.temp | ||
| 79 | - | ||
| 80 | - done < <(cat $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties) | 52 | +# if [ -e ./app.properties.temp ]; then |
| 53 | +# # rm ./app.properties.temp | ||
| 54 | +# echo "Seems ./app.properties has been modified already" | ||
| 55 | +# else | ||
| 56 | +# modify app.properties in any case ! | ||
| 57 | +while read line | ||
| 58 | + do | ||
| 81 | 59 | ||
| 82 | - cp ./app.properties.temp $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties | ||
| 83 | -fi | 60 | + if [[ $line == app.param.path* ]]; then |
| 61 | + line="app.param.path="$NEWMETA"final/" | ||
| 62 | + fi | ||
| 63 | + | ||
| 64 | + if [[ $line == app.dataSetInfo.path* ]]; then | ||
| 65 | + line="app.dataSetInfo.path="$NEWMETA"datasets/" | ||
| 66 | + fi | ||
| 67 | + | ||
| 68 | + if [[ $line == app.user.name* ]]; then | ||
| 69 | + line="app.user.name="$DDUSER | ||
| 70 | + fi | ||
| 71 | + | ||
| 72 | + if [[ $line == app.plugin* ]]; then | ||
| 73 | + line="app.plugin=./../build/"$KERNEL_BUILD_TYPE"/plugin/" | ||
| 74 | + fi | ||
| 75 | + | ||
| 76 | + if [[ $line == app.process.LIB* ]]; then | ||
| 77 | + line="app.process.LIB=-L../build/"$KERNEL_BUILD_TYPE"/lib/ -lParameters" | ||
| 78 | + fi | ||
| 79 | + | ||
| 80 | + echo $line >> ./app.properties.temp | ||
| 81 | + | ||
| 82 | + done < <(cat $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties) | ||
| 83 | + | ||
| 84 | +cp ./app.properties.temp $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties | ||
| 85 | +#fi | ||
| 84 | 86 | ||
| 85 | 87 | ||
| 86 | DDLogin $DDUSER $DDPASS | 88 | DDLogin $DDUSER $DDPASS |
| @@ -92,7 +94,8 @@ do | @@ -92,7 +94,8 @@ do | ||
| 92 | 94 | ||
| 93 | if [ -e $NEWMETA/ParamInfo/$info_file ] | 95 | if [ -e $NEWMETA/ParamInfo/$info_file ] |
| 94 | then | 96 | then |
| 95 | - echo ${param_filename} exists | 97 | + # echo ${param_filename} exists |
| 98 | + temp=a | ||
| 96 | else | 99 | else |
| 97 | echo "Generate info file for ${param_filename}" | 100 | echo "Generate info file for ${param_filename}" |
| 98 | amdaParameterInfo -p ${param_filename} | 101 | amdaParameterInfo -p ${param_filename} |