]> Creatis software - creaToolsTools.git/commitdiff
run *everything* with bash (*not* with sh)
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Tue, 15 Feb 2011 15:39:43 +0000 (15:39 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Tue, 15 Feb 2011 15:39:43 +0000 (15:39 +0000)
Linux/scripts/Check-if-root.sh
Linux/scripts/CreaTools-compile.sh
Linux/scripts/CreaTools-install.sh
Linux/scripts/CreaTools-load.sh
Linux/scripts/CreaTools-uninstall.sh
Linux/scripts/ThirdParty-install.sh

index 15cbbd2d8fcc7babf7cd6fa854961f7f148c2f17..f62f64bfb43faa785f7654765a46700b532493fe 100644 (file)
@@ -1,4 +1,4 @@
-#!/bin/bassh -e
+#!/bin/bash -e
 
 if [ $UID != 0 ] 
 then
index 11d8e44a78aae903beae301485ed6d80a9ab1461..b7d8fcce15e200ff6224fdba76d733b448054c31 100644 (file)
@@ -73,10 +73,10 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
- sh $scriptDir/cmakemod.sh                  $creasource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaVariables.sh             $creasource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh     $buildType $creasource $generationdir
- sh $scriptDir/ctestmod.sh                  $creasource $generationdir
bash $scriptDir/cmakemod.sh                  $creasource $generationdir $installPrefix $buildType 
bash $scriptDir/creaVariables.sh             $creasource $generationdir $docgeneration
bash $scriptDir/compilemod.sh     $buildType $creasource $generationdir
bash $scriptDir/ctestmod.sh                  $creasource $generationdir
 fi
 fi
  creadll=$generationdir/creatools_bin/creaBin
@@ -94,10 +94,10 @@ if [ true = true ]
 then
 # BBTK
 echo ========================================================= $bbtksource $generationdir $installPrefix $buildType
- sh $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
- sh $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
- sh $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir
- sh $scriptDir/ctestmod.sh               $bbtksource $generationdir
bash $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
bash $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir
bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
 fi
 fi
  bbtkdll=$generationdir/creatools_bin/bbtkBin
@@ -114,10 +114,10 @@ then
 if [ true = true ]
 then
 # creaMaracasVisu
- sh $scriptDir/cmakemod.sh              $creamaracassource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaMaracasVariables.sh  $creamaracassource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh $buildType $creamaracassource $generationdir
- sh $scriptDir/ctestmod.sh              $creamaracassource $generationdir
bash $scriptDir/cmakemod.sh              $creamaracassource $generationdir $installPrefix $buildType 
bash $scriptDir/creaMaracasVariables.sh  $creamaracassource $generationdir $docgeneration
bash $scriptDir/compilemod.sh $buildType $creamaracassource $generationdir
bash $scriptDir/ctestmod.sh              $creamaracassource $generationdir
 fi
 fi
  creamaracasdll=$generationdir/creatools_bin/creamaracasBin
@@ -134,10 +134,10 @@ then
 if [ true = true ]
 then
 # creaEnvironment
- sh $scriptDir/cmakemod.sh                 $creaenvironmentsource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh $buildType    $creaenvironmentsource $generationdir
- sh $scriptDir/ctestmod.sh                 $creaenvironmentsource $generationdir
bash $scriptDir/cmakemod.sh                 $creaenvironmentsource $generationdir $installPrefix $buildType 
bash $scriptDir/creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
bash $scriptDir/compilemod.sh $buildType    $creaenvironmentsource $generationdir
bash $scriptDir/ctestmod.sh                 $creaenvironmentsource $generationdir
 fi
 fi
  creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin
@@ -154,10 +154,10 @@ then
 if [ true = true ]
 then
 # creaBruker
- sh $scriptDir/cmakemod.sh              $creabrukersource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaBrukerVariables.sh   $creabrukersource $generationdir $docgeneration $gdcmVersion
- sh $scriptDir/compilemod.sh $buildType $creabrukersource $generationdir
- sh $scriptDir/ctestmod.sh              $creabrukersource $generationdir
bash $scriptDir/cmakemod.sh              $creabrukersource $generationdir $installPrefix $buildType 
bash $scriptDir/creaBrukerVariables.sh   $creabrukersource $generationdir $docgeneration $gdcmVersion
bash $scriptDir/compilemod.sh $buildType $creabrukersource $generationdir
bash $scriptDir/ctestmod.sh              $creabrukersource $generationdir
 fi
 fi
  creabrukerdll=$generationdir/creatools_bin/creabrukerBin
@@ -174,10 +174,10 @@ then
 if [ true = true ]
 then
 # creaImageIO
- sh $scriptDir/cmakemod.sh              $creaimagesource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration $gdcmVersion
- sh $scriptDir/compilemod.sh $buildType $creaimagesource $generationdir
- sh $scriptDir/ctestmod.sh              $creaimagesource $generationdir
bash $scriptDir/cmakemod.sh              $creaimagesource $generationdir $installPrefix $buildType 
bash $scriptDir/creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration $gdcmVersion
bash $scriptDir/compilemod.sh $buildType $creaimagesource $generationdir
bash $scriptDir/ctestmod.sh              $creaimagesource $generationdir
 fi
 fi
  creaimagedll=$generationdir/creatools_bin/creaimageBin
@@ -194,10 +194,10 @@ then
 if [ true = true ]
 then
 # creaContours
- sh $scriptDir/cmakemod.sh              $creacontourssource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir
- sh $scriptDir/ctestmod.sh              $creacontourssource $generationdir
bash $scriptDir/cmakemod.sh              $creacontourssource $generationdir $installPrefix $buildType 
bash $scriptDir/creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
bash $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir
bash $scriptDir/ctestmod.sh              $creacontourssource $generationdir
 fi
 fi
 # creacontourdll=$generationdir/creatools_bin/creacontoursBin
@@ -213,10 +213,10 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
- sh $scriptDir/cmakemod.sh                         $crearigidregistrationssource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaRigidRegistrationVariables.sh   $crearigidregistrationssource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh            $buildType $crearigidregistrationssource $generationdir
- sh $scriptDir/ctestmod.sh                         $crearigidregistrationssource $generationdir
bash $scriptDir/cmakemod.sh                         $crearigidregistrationssource $generationdir $installPrefix $buildType 
bash $scriptDir/creaRigidRegistrationVariables.sh   $crearigidregistrationssource $generationdir $docgeneration
bash $scriptDir/compilemod.sh            $buildType $crearigidregistrationssource $generationdir
bash $scriptDir/ctestmod.sh                         $crearigidregistrationssource $generationdir
 fi
 fi
 # crearigidregistrationdll=$generationdir/creatools_bin/crearigidregistrationBin
@@ -233,10 +233,10 @@ then
 if [ true = true ]
 then
 # bbtkGEditor
- sh $scriptDir/cmakemod.sh              $bbtkgeditorsource $generationdir $installPrefix $buildType 
- sh $scriptDir/bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh $buildType $bbtkgeditorsource $generationdir
- sh $scriptDir/ctestmod.sh              $bbtkgeditorsource $generationdir
bash $scriptDir/cmakemod.sh              $bbtkgeditorsource $generationdir $installPrefix $buildType 
bash $scriptDir/bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
bash $scriptDir/compilemod.sh $buildType $bbtkgeditorsource $generationdir
bash $scriptDir/ctestmod.sh              $bbtkgeditorsource $generationdir
 fi
 fi
 # bbtkgeditordll=$generationdir/creatools_bin/bbtkgeditorBin
@@ -253,9 +253,9 @@ then
 if [ true = true ]
 then
 # creaTools
- sh $scriptDir/cmakemod.sh                $creatoolssource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaToolsVariables.sh      $creatoolssource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh   $buildType $creatoolssource $generationdir
bash $scriptDir/cmakemod.sh                $creatoolssource $generationdir $installPrefix $buildType 
bash $scriptDir/creaToolsVariables.sh      $creatoolssource $generationdir $docgeneration
bash $scriptDir/compilemod.sh   $buildType $creatoolssource $generationdir
 fi
 fi
 
index 9dd0fc48efbc5bcaf62a03a33228866a0fc63af7..e717960f79618cfc953ee8d8109ddaa68b5f3ce1 100644 (file)
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 if [ $UID = 0 ] 
 then
   # Set all local variables
@@ -8,16 +7,16 @@ then
   source $PWD/scripts/CreaTools-names.sh
   
   cd $scriptDir
-  sh installmod.sh $buildType $creasource                   $generationdir  
-  sh installmod.sh $buildType $bbtksource                   $generationdir
-  sh installmod.sh $buildType $creamaracassource            $generationdir  
-  sh installmod.sh $buildType $creaenvironmentsource        $generationdir
-  sh installmod.sh $buildType $creabrukersource             $generationdir
-  sh installmod.sh $buildType $creaimagesource              $generationdir
-  sh installmod.sh $buildType $creacontourssource           $generationdir
-  sh installmod.sh $buildType $crearigidregistrationssource $generationdir
-  sh installmod.sh $buildType $bbtkgeditorsource            $generationdir
-  sh installmod.sh $buildType $creatoolssource              $generationdir
+  bash installmod.sh $buildType $creasource                   $generationdir  
+  bash installmod.sh $buildType $bbtksource                   $generationdir
+  bash installmod.sh $buildType $creamaracassource            $generationdir  
+  bash installmod.sh $buildType $creaenvironmentsource        $generationdir
+  bash installmod.sh $buildType $creabrukersource             $generationdir
+  bash installmod.sh $buildType $creaimagesource              $generationdir
+  bash installmod.sh $buildType $creacontourssource           $generationdir
+  bash installmod.sh $buildType $crearigidregistrationssource $generationdir
+  bash installmod.sh $buildType $bbtkgeditorsource            $generationdir
+  bash installmod.sh $buildType $creatoolssource              $generationdir
   
   touch     $installPrefix/share/creatools_base_library_config.sh
   rm        $installPrefix/share/creatools_base_library_config.sh
index c323a836a760221b0ce6b703fdd1fec734c5ce43..15a46e9b7af97f23f1cb785dee278b504f543275 100644 (file)
@@ -79,16 +79,16 @@ then
 #
       if [ $sourcesFrom = CVS ]
       then
-         sh $scriptDir/cvscheckout.sh $creasource                   $generationdir $cvsUserName
-         sh $scriptDir/cvscheckout.sh $bbtksource                   $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creamaracassource            $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creabrukersource             $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creaimagesource              $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creacontourssource           $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creatoolssource              $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creasource                   $generationdir $cvsUserName
+         bash $scriptDir/cvscheckout.sh $bbtksource                   $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creamaracassource            $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creabrukersource             $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creaimagesource              $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creacontourssource           $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creatoolssource              $generationdir $cvsUserName 
       fi
 
       if [ $sourcesFrom = HTML ]
index d1f4b114f2d3f993d20a23d46c94678042fc5f37..e174801b8ca22eb086940aa1a386558e6fb6dcfc 100644 (file)
@@ -90,7 +90,7 @@ else
 fi
 
   # revert /etc/bashrc to previous value  
-  # - remove line 'sh $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh'
+  # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh'
   sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC 
 
 else
index 11d5ca0a943d3bbf5ceb198ac1b4eaae51060338..d0c75d758784af0d8726a0be997eb12e21bd09bf 100644 (file)
@@ -241,7 +241,7 @@ echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR     >> $installPrefixThird
 echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR        >> $installPrefixThird/share/creatools_third_party_library_config.sh
 
 #  modify .bashrc
-# - remove line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
+# - remove line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
 
 if [ ! -f /etc/bashrc ]
 then
@@ -259,7 +259,7 @@ fi
    sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC
 
 
-# - add line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
+# - add line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
 echo installPrefixThird=$installPrefixThird >> $ETC_BASHRC
 echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh' >> $ETC_BASHRC