X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-install.sh;h=06e59d130b913cb90ebbb97f2ccbded07f324e74;hb=f2dbd1d0f0524ecfe81a3e2ca1496450375d21ff;hp=d8d7caeac3f940b4bc50d518419f913d26f73105;hpb=a0b3560b65656c6c2601dced3aeddebd66c0ea6d;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index d8d7cae..06e59d1 100644
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -1,25 +1,40 @@
 #!/bin/bash
 
-if [ $UID = 0 ] 
-then
+# JPR 2/5/2011
+#if [ $UID = 0 ] 
+#then
   # Set all local variables
   source $PWD/scripts/CreaTools-configure.sh
   source $PWD/scripts/CreaTools-names.sh
+ 
+  if [ -e $generationdir ]
+  then
+     if [ ! -e $generationdir/creatools_install ]
+     then
+     	mkdir $generationdir/creatools_install
+     fi
+  else
+   echo
+   echo "..ERROR.."
+   echo "==================================================="
+   echo "REMEMBER !"
+   echo ""
+   echo "You MUST load the Creatools sources before (use 2.2)!"
+   echo "==================================================="
+   echo
+   echo 
+   read a
+   exit 0 
+  fi  
   
   cd $scriptDir
-  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
+
+#create creatools_base_library_config.sh  at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011
+
+  if [ -f $installPrefix/share/creatools_base_library_config.sh ]
+  then
+     rm        $installPrefix/share/creatools_base_library_config.sh
+  fi
   touch     $installPrefix/share/creatools_base_library_config.sh
   chmod 755 $installPrefix/share/creatools_base_library_config.sh
   
@@ -27,33 +42,62 @@ then
   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
   
-	      if [ ! -f /etc/bashrc ]
-	      then
-	         echo
-	         echo "You are probabely running under UBUNTU OS  ?"
-		 echo "Troubles expected! (Hope NO!)"
-		 echo   
-		 echo "Hit any key to continue"
-                 read a
-	         echo export ETC_BASHRC="/etc/bash.bashrc"
-              else
-                 echo export ETC_BASHRC="/etc/bashrc"
-              fi
+# Install creatools as user (no longer as root) // JPR 2/5/2011 
+ 
+#	      if [ ! -f /etc/bashrc ]
+#	      then
+#	         export ETC_BASHRC="/etc/bash.bashrc"
+#              else
+#                 export ETC_BASHRC="/etc/bashrc"
+#             fi
+
+export ETC_BASHRC=$HOME/.bashrc
 	      
-  # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' if any
+  # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh' if any
   sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC
+  sed -i -e '/installPrefixtmp*/ d' $ETC_BASHRC
+  
+  # JPR 2/5/2011
   #  modify /etc/bashrc (we cannot modify .bashrc, since we switched as root)  
-  # - add line 'bash $installPrefix/creatools_install/share/creatools_base_libraries_config.sh'
-  echo source $installPrefix/share/creatools_base_library_config.sh >> $ETC_BASHRC
-else
-  echo
-  echo "..ERROR.."
-  echo "==================================================="
-  echo "REMEMBER !"
-  echo ""
-  echo "YOU NEED TO RUN THIS ONE AS root"
-  echo "==================================================="
-  echo
-  echo
-fi 
+  # - add line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh'
+
+  bash installmod.sh $buildType $creasource                   $generationdir  $installPrefix
+  bash installmod.sh $buildType $bbtksource                   $generationdir  $installPrefix
+  bash installmod.sh $buildType $creamaracassource            $generationdir  $installPrefix
+  bash installmod.sh $buildType $creaenvironmentsource        $generationdir  $installPrefix
+  bash installmod.sh $buildType $creabrukersource             $generationdir  $installPrefix
+  bash installmod.sh $buildType $creaimagesource              $generationdir  $installPrefix
+  bash installmod.sh $buildType $creacontourssource           $generationdir  $installPrefix
+  bash installmod.sh $buildType $crearigidregistrationssource $generationdir  $installPrefix
+  bash installmod.sh $buildType $bbtkgeditorsource            $generationdir  $installPrefix
+  bash installmod.sh $buildType $creatoolssource              $generationdir  $installPrefix
+  bash installmod.sh $buildType $creaminitoolssource          $generationdir  $installPrefix
+   
+  #should be nice to add bbwx, too. (?) // JPR
+  #bash installmod.sh $buildType bbwx              $generationdir  $installPrefix
+  
+    
+echo installPrefixtmp=$installPrefix >> $ETC_BASHRC
+echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] &&  source $installPrefixtmp/share/creatools_base_library_config.sh' >> $ETC_BASHRC 
+
+source $installPrefix/share/creatools_base_library_config.sh
+echo "==================================================="
+echo " Regenerate Package doc"
+$installPrefix/bin/bbRegeneratePackageDoc -a -q
+echo " Regenerate Boxes list"
+$installPrefix/bin/bbRegenerateBoxesLists -q
+echo "==================================================="
+
+  # JPR 2/5/2011
+#else
+#  echo
+#  echo "..ERROR.."
+#  echo "==================================================="
+#  echo "REMEMBER !"
+#  echo ""
+#  echo "YOU NEED TO RUN THIS ONE AS root"
+#  echo "==================================================="
+#  echo
+#  echo
+#fi