Fix

diff --git a/Linux/menu.sh b/Linux/menu.sh
index ba05a03f92cfbfb46cbcbaccde998d3f2d9ad01b..63016e586be47c9d1055b12d40b3b6708485b782 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -16,7 +16,7 @@ fi
 
 
 i=999
-while [ $i != 9 ]
+while [ "$i" != 9 ]
 do
    echo
    echo
@@ -63,7 +63,11 @@ do
   else
      suitable="NO"
   fi
-
+  if [ "$suitable" = "YES" ]
+  then
+     source scripts/CreaTools-configure.sh
+  fi
+  
   if [ "$suitable" = "NO" ]
   then
      echo
@@ -154,26 +158,26 @@ do
         echo
         # ------------------
 
-        linuxUserName=""
-        while [ "$linuxUserName" == "" ]
+        loginUserName=""
+        while [ "$loginUserName" == "" ]
         do 
            echo "Have a look at the following line to know 'Login User Name'/'Login Group Name'"
            ls -l menu.sh
            echo "Login User Name (mandatory!)"
-           read linuxUserName  
-           echo "you said : [" $linuxUserName "]"  
+           read loginUserName  
+           echo "you said : [" $loginUserName "]"  
         done
         echo
         echo
 
-        linuxGroupName=""
-        while [ "$linuxGroupName" == "" ]
+        loginGroupName=""
+        while [ "$loginGroupName" == "" ]
         do
             #echo "Have a look at the following line to know 'Login User Name'/'Login Group Name'"
             #echo "Login Group Name (mandatory!)"
           echo "Login Group Name (mandatory!)"
-           read linuxGroupName  
-           echo "you said : [" $linuxGroupName "]"  
+           read loginGroupName  
+           echo "you said : [" $loginGroupName "]"  
         done
         echo
         echo
@@ -219,8 +223,8 @@ do
         then
            echo "           CVS User Name                              : $cvsUserName"
         fi
-        echo "           Login User Name                            : $linuxUserName"
-        echo "           Login Group Name                           : $linuxGroupName"
+        echo "           Login User Name                            : $loginUserName"
+        echo "           Login Group Name                           : $loginGroupName"
         echo "           Build type                                 : $buildType"          
         echo "           Gdcm version                               : $gdcmVersion"
         echo
@@ -249,8 +253,8 @@ do
    echo "docgeneration=$docgeneration"       >> $configureFile
    echo "sourcesFrom=$sourcesFrom"           >> $configureFile
    echo "cvsUserName=$cvsUserName"           >> $configureFile 
-   echo "loginUserName=$linuxUserName"       >> $configureFile
-   echo "loginGroupName=$linuxGroupName"     >> $configureFile
+   echo "loginUserName=$loginUserName"       >> $configureFile
+   echo "loginGroupName=$loginGroupName"     >> $configureFile
    echo "buildType=$buildType"               >> $configureFile
    echo "gdcmVersion=$gdcmVersion"           >> $configureFile
 
@@ -314,14 +318,16 @@ do
   
   3)
      echo "========================== 3"
+     source scripts/CreaTools-configure.sh
      sh scripts/CreaTools-compile.sh
      
      # To allow (*very* aware) user to patch code, later
-     chown -R $linuxUserName $generationdir/creatools_source
-     chgrp -R $linuxGroupName $generationdir/creatools_source
+  
+     chown -R $loginUserName $generationdir/creatools_source
+     chgrp -R $loginGroupName $generationdir/creatools_source
      # Too much time consuming
-     #chown -R $linuxUserName $generationdir/creatools_source 
-     #chgrp -R $linuxGroupName $generationdir/creatools_source     
+     #chown -R $loginUserName $generationdir/creatools_source 
+     #chgrp -R $loginGroupName $generationdir/creatools_source     
   ;;
   
   4) 
@@ -339,7 +345,7 @@ do
   ;;
    
   *)
-  echo "Your answer must be in {0, 1, 2, 3, 4, 5, 9} (was $i)"
+  echo "Your answer must be in {0, 1, 2, 3, 4, 5, 9} (was [ $i ])"
   ;;
   esac
 

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 2a0efdd884c5f2c630226c745a2b24843ec11b11..aea3c4724dbdf617c247214934849db6451c80c5 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -76,7 +76,6 @@ fi
  creadll=$generationdir/creatools_bin/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
 
-exit 0
 
 # -------------------------
 #        start_point =  3 : BBTK