From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Mon, 28 Feb 2011 11:47:00 +0000 (+0000)
Subject: re indent + remove deprecated
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=df2ba43e0e87425e23ab6621fcc4124804580df1;p=creaToolsTools.git

re indent + remove deprecated
---

diff --git a/Linux/menu.sh b/Linux/menu.sh
index a9f1ff8..9af41e2 100644
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -285,7 +285,8 @@ do
  # dans $generationdir/creatools_bin ?
  # -> il n'est pas encore cree !
  # dans ./Linux/scripts?
- # -> ? 
+ # ==> On le genere chez l'utilisateur (no choice!)...
+ # 
 
    configureFile="scripts/CreaTools-configure.sh"
    touch  $configureFile
@@ -307,7 +308,6 @@ do
    echo "buildType=$buildType"                   >> $configureFile
    echo "gdcmVersion=$gdcmVersion"               >> $configureFile
    
-
   # ------------------      
   # endif 'suitable'
   fi 
@@ -317,57 +317,6 @@ do
      echo "========================== 1 "
      source scripts/Check-if-root.sh
      bash scripts/ThirdParty-install.sh
-     
-#      vtkdirVariable=""
-#      while [ "$vtkdirVariable" = "" ]
-#      do
-#         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 "]"
-
-     #vtkdirVariable=""
-     #while [ "$vtkdirVariable" = "" ]
-     #do
-     #   echo " Set VTK_DIR environment variable"
-      #  read vtkdirVariable
-     #done
-     #echo "you said [" $vtkdirVariable "]"
-          
-#      latexCompilerVariable=""
-#      while [ "$latexCompilerVariable" = "" ]
-#      do
-#         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 "]"     
-
-#     sed -i -e '/.*VTK_DIR*/ d'        $ETC_BASHRC
-#     sed -i -e '/.*LATEX_COMPILER*/ d' $ETC_BASHRC 
-#     echo "export VTK_DIR=$vtkdirVariable" >> $ETC_BASHRC
-#     echo "export LATEX_COMPILER=$latexCompilerVariable" >> $ETC_BASHRC
 
      if [ "$sourcesFrom" = "CVS" ]
      then
@@ -388,27 +337,25 @@ do
   ;;
 
   2)
-    
-     
      echo "========================== 2" 
      bash scripts/CreaTools-load.sh
   ;;
-  
+
   3)
      echo "========================== 3"
      source scripts/CreaTools-configure.sh
      
      bash scripts/CreaTools-compile.sh
-     
+
      # To allow (*very* aware) user to patch code, later
      if [ ! -e $generationdir/creatools_source ]
      then
         echo "You probabely made a mistake : "
-	echo "Directory $loginUserName $generationdir/creatools_source not found"
-	echo "Make sure you know the mistake"
-	echo "Hit any key to continue"
-	echo "Fix the mistake!"	
-	read a
+	    echo "Directory $loginUserName $generationdir/creatools_source not found"
+	    echo "Make sure you know the mistake"
+	    echo "Hit any key to continue"
+	    echo "Fix the mistake!"
+	    read a
      else
         chown -R $loginUserName  $generationdir/creatools_source
         chgrp -R $loginGroupName $generationdir/creatools_source
@@ -470,23 +417,23 @@ do
 
      if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
      then
-              echo WARNING
-              echo
-              echo "the curently used Third Party libraries are NOT in $installPrefixThird but in :"
-              grep "installPrefixThird=" /etc/bashrc    
-              echo "VTK_DIR :...." $VTK_DIR
-              echo "ITK_DIR :...." $ITK_DIR
-              echo "GDCM_DIR :..." $GDCM_DIR
-	      echo
-	      echo "installPrefixThird ... " $installPrefixThird
+        echo WARNING
+        echo
+        echo "the curently used Third Party libraries are NOT in $installPrefixThird but in :"
+        grep "installPrefixThird=" /etc/bashrc
+        echo "VTK_DIR :...." $VTK_DIR
+        echo "ITK_DIR :...." $ITK_DIR
+        echo "GDCM_DIR :..." $GDCM_DIR
+	    echo
+	    echo "installPrefixThird ... " $installPrefixThird
      fi
 	     
      if [ -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
      then
         echo  $installPrefixThird/share/creatools_third_party_library_config.sh
-	echo  ------
-	more $installPrefixThird/share/creatools_third_party_library_config.sh
-	echo  ------
+	    echo  ------
+	    more $installPrefixThird/share/creatools_third_party_library_config.sh
+	    echo  ------
      fi
      
      echo
@@ -494,10 +441,10 @@ do
      if [ -f $installPrefix/share/creatools_base_library_config.sh ]
      then
         echo  $installPrefix/share/creatools_base_library_config.sh
-	echo  ------ 
-	more $installPrefix/share/creatools_base_library_config.sh
-	echo  ------ 
-	echo
+	    echo  ------ 
+	    more $installPrefix/share/creatools_base_library_config.sh
+	    echo  ------ 
+	    echo
         echo "installPrefix ... " $installPrefix
      fi   
      echo "==================================="