From: jean-pierre roux Date: Wed, 19 Jan 2011 13:51:39 +0000 (+0000) Subject: more checking X-Git-Tag: Creatools2-0-3.creaToolsTools2-0-3.17Feb2011~31 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=be08f90226feed66d5f7ebac8cfca387d9afdd1f;p=creaToolsTools.git more checking --- diff --git a/Linux/menu.sh b/Linux/menu.sh index 63016e5..8852374 100644 --- a/Linux/menu.sh +++ b/Linux/menu.sh @@ -270,12 +270,19 @@ do vtkdirVariable="" while [ "$vtkdirVariable" = "" ] do - echo - echo " --------------------------------" - echo " Set VTK_DIR environment variable" - echo " --------------------------------" - echo - read vtkdirVariable + while [ ! -e "$vtkdirVariable" ] + do + echo + echo " --------------------------------" + echo " Set VTK_DIR environment variable" + echo " --------------------------------" + echo + read vtkdirVariable + if [ ! -e "$vtkdirVariable" ] + then + echo $vtkdirVariable is NOT a valid directory + fi + done done echo "you said [" $vtkdirVariable "]" @@ -290,12 +297,19 @@ do latexCompilerVariable="" while [ "$latexCompilerVariable" = "" ] do - echo - echo " ---------------------------------------" - echo " Set LATEX_COMPILER environment variable" - echo " ---------------------------------------" - echo - read latexCompilerVariable + while [ ! -f "$latexCompilerVariable" ] + do + echo + echo " ---------------------------------------" + echo " Set LATEX_COMPILER environment variable" + echo " ---------------------------------------" + echo + read latexCompilerVariable + if [ ! -e "$latexCompilerVariable" ] + then + echo $latexCompilerVariable is NOT a valid file + fi + done done echo "you said [" $latexCompilerVariable "]" diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh index 3f866ad..328efba 100644 --- a/Linux/scripts/ThirdParty-install.sh +++ b/Linux/scripts/ThirdParty-install.sh @@ -27,8 +27,8 @@ source $PWD/scripts/CreaTools-configure.sh echo $buildType echo --gdcmVersion-- echo $gdcmVersion - echo --sourcesFrom-- - echo $sourcesFrom +# echo --sourcesFrom-- +# echo $sourcesFrom # echo --scriptDir-- # echo $scriptDir # echo --start_point-- @@ -47,10 +47,6 @@ then mkdir $binDir fi -if [ -f $installPrefix/share/creatools_third_party_library_config.sh ] -then - rm $installPrefix/share/creatools_third_party_library_config.sh -fi # the following stupid test is used at debug time; Please don't remove! if [ true = true ] @@ -204,8 +200,18 @@ then cp tth $installPrefix/bin fi + #deal with create creatools_third_party_libraries_config.sh +if [ -f $installPrefix/share/creatools_third_party_library_config.sh ] +then + rm $installPrefix/share/creatools_third_party_library_config.sh +fi + +if [ ! -e $installPrefix/share ] +then + mkdir $installPrefix/share +fi touch $installPrefix/share/creatools_third_party_library_config.sh chmod 755 $installPrefix/share/creatools_third_party_library_config.sh