Allow reusing scripts/CreaTools-configure.sh

diff --git a/Linux/README.txt b/Linux/README.txt
index 0e6e39c9812a732e883c737ad7ac79adc77601a6..8332bdcf641c4d4d51635684deb98ecb2126ee72 100644 (file)
--- a/Linux/README.txt
+++ b/Linux/README.txt
@@ -19,8 +19,9 @@ You will be prompted to give your preferences :
 "Boolean for Doc Generation : YES/NO (default is NO)"
 "Where do you want to get source files from : CVS/HTML (default is HTML)"
 -> if you choosed CVS 
-"CVS User Name (mandatory!)"
-"LINUX/MacOS User Name (mandatory!)"
+"CVS User name (mandatory!)"
+"Login 'User' name (mandatory!)"
+"Login 'Group' name (mandatory!)"
 "Build type : Release/Debug (default is Release)"
 "Gdcm version : GDCM1/GDCM2 (default is GDCM1)"
 

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 5918a29ffad2695bd9ecf43c9bbe7d4dd90791c2..618c70222a3c28c300cc1c3425391c1bc7037027 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -41,6 +41,30 @@ read i
 
   case $i in
   0)
+  suitable=XXX
+  ls -l  scripts/CreaTools-configure.sh
+  if [ -f scripts/CreaTools-configure.sh ]
+  then
+     while [[ "$suitable" != "YES" && \
+              "$suitable" != "NO" ]]
+     do          
+        echo "'Configure' already done : "
+        echo "------------------------"
+        more scripts/CreaTools-configure.sh
+        echo "------------------------"
+        echo "Are the following values suitable for you : YES/NO (default is YES)?"
+        read suitable
+        if [ "$suitable" = "" ]
+        then
+           $suitable="YES"
+        fi
+     done
+  else
+     $suitable="NO"
+  fi
+   
+  if [ "$suitable" = "NO" ]
+  then
 echo
 echo
   confirm="NO"
@@ -203,8 +227,7 @@ echo
 echo
 echo "Do you confirm your choices : YES/NO ? (default is NO)"
 read confirm
-done 
-
+done
 
  # GROS SOUCIS : Ou creer le fichier CreaTools-configure.sh?
  # dans $generationdir/creatools_bin ?
@@ -233,6 +256,8 @@ echo "gdcmVersion=$gdcmVersion"           >> $configureFile
 
          
   # ------------------      
+# endif 'suitable'
+fi 
   ;;
   
   1)