X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Finstallscript;h=b5209a52ddd30bd02a296e05f943fdd2e44ce87c;hb=8987c596864a8a2fd7786e6aea59cdd03904ae14;hp=836e55ecba78a77a7b0ada014b9cc5eca773824c;hpb=33e49188f1903ed3abeefd2831cc6bb4b88813a1;p=creaToolsTools.git

diff --git a/Linux/installscript b/Linux/installscript
index 836e55e..b5209a5 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -29,115 +29,8 @@ scriptDirName=$(dirname $(readlink -f $0) )
 ############     Local Functions  #######################################
 #########################################################################
 
-##########################################
-# check that $1 is one of $2, $3, ...
-function checkVal  {
-    local val=$1
-    shift
-    for x in $* ; do
-        if [ "$val" == "$x" ] ; then
-            echo "true"
-            return
-        fi
-    done
-    echo "false"
-}
-
-###########################################
-function bigDisplay {
-    echo " ================================================================================================"
-    echo " ================================================================================================"
-    echo " ======= $1"                                       
-    echo " ================================================================================================"
-    echo " ================================================================================================"
-}
-
-###########################################
-function checkDistrib {
-    local OS=$1
-
-    if [ "`checkVal $OS MacOS Fedora Ubuntu Mandriva`" == "false" ] ; then
-        echo "Operating System not supported: $OS"
-        echo "Currently supported system: Fedora Ubuntu MacOS"
-        exit 1
-    fi
-}
-
-###########################################
-function getDistrib {
-    local OS=`uname`
-
-      if [ "$OS" == Darwin ] ; then OS=MacOS;
-    elif [ "$OS" == Linux  ] ; then OS=`awk 'NR==1{print $1}' /etc/issue`
-    else OS=""
-    fi
 
-#    checkDistrib $OS
-
-    echo $OS
-}
-
-###########################################
-function getncore {
-    if [ `uname` == Darwin ] ; then # MacOS
-        system_profiler | grep Processor | awk '$1=="Number" {print $4}'
-    else
-        cat /proc/cpuinfo | grep processor | wc -l
-    fi
-}
-
-###########################################
-function getbashrc {
-    if [ ! -f $HOME/.bashrc ] ; then
-        touch $HOME/.bashrc
-    fi
-    echo $HOME/.bashrc
-
-
-#    # Do it, while we are under user, not under root! # JPR
-#    if [ -f $HOME/.bashrc ] ; then
-#        echo $HOME/.bashrc
-#    else
-#        if [ -f $HOME/.profile ] ; then
-#            echo $HOME/.profile
-#        else
-#            echo "=============== BIG TROUBLE : neither $HOME/.bashrc nor $HOME/.profile file found" > /dev/stderr
-#            echo "=============== You'd better abort the program and (try to) fix the issue" > /dec/stderr
-#            read a # just to let the user time enough to read the message...
-#        fi
-#    fi
-}
-
-
-###########################################
-function printconfig {
-
-    echo
-    echo "Current Configuration:"
-    echo "  Operating System                           : $OperatingSystem"
-    echo "  Number of Cores                            : $corenumber"	
-    echo "  Name of the Generation Directory           : $generationdir"
-    echo "  Install Prefix for Third Party Libraries   : $installPrefixThird"	
-    echo "  Install Prefix for CreaTools               : $installPrefix"
-    echo "  Boolean for Doc Generation                 : $docgeneration"
-    echo "  Where do you want to get source files from : $sourcesFrom"
-    echo "  Login User Name                            : $loginUserName"
-    echo "  Login Group Name                           : $loginGroupName"
-    echo "  Build type                                 : $buildType"          
-    echo "  Gdcm version                               : $gdcmVersion"
-    echo "  ITK version                                : $ITKVersion"
-    echo
-
-}
-
-
-
-##################################################################################################
-##################################################################################################
-##################################################################################################
-##################################################################################################
-##################################################################################################
-##################################################################################################
+source scripts/LocalFunctions.sh
 
 configureFile="scripts/CreaTools-configure.sh"
 
@@ -156,10 +49,7 @@ loginGroupName=`groups | awk '{print $1}'`
 buildType=Release
 gdcmVersion=GDCM1
 ITKVersion=ITK3
-export ETC_BASHRC=~/.bashrc
-
-
-
+export ETC_BASHRC=`getbashrc`
 
 
 function usage {
@@ -348,19 +238,13 @@ fi
 # install packaged dependencies as root
 if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
     bigDisplay "INSTALL PACKAGES DEPENDENCIES"
-    if [ "`whoami`" == root ] ; then
-       echo ThirdParty-install-Base-Stuff
-       bash scripts/ThirdParty-install-Base-Stuff.sh
-    else 
-        # must log as root
-        echo "Please enter the root passwd to add necessary packages:"; 
-        su -c "bash scripts/ThirdParty-install-Base-Stuff.sh"   
-    fi
+    source scripts/CreaTools-configure.sh
+    cd scripts
+    source ThirdParty-install-Base-Stuff.sh $OperatingSystem
+    cd ..
     bash scripts/ThirdParty-install.sh
 fi
 
-
-
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
     bigDisplay "INSTALL VTK"
@@ -379,12 +263,9 @@ fi
 if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
     bigDisplay "INSTALL $ITKVersion"
     bash scripts/ThirdParty-install-ITK.sh
+    cd $scriptDirName
 fi
 
-## ??
-#if [ `checkVal $command all 3rd` == true ] ; then
-#    bash scripts/ThirdParty-install.sh
-#fi
 
 # Setup the user .bashrc correctly
 if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then
@@ -400,6 +281,8 @@ fi
 # compile creatools
 if [ `checkVal $command all creatools creatools-cmp` == true ] ; then
     bigDisplay "COMPILE CREATOOLS"
+echo "EED installscript compile creatools"
+echo $ETC_BASHRC
     source $ETC_BASHRC
     bash -x scripts/CreaTools-compile.sh
 
@@ -427,8 +310,8 @@ if [ `checkVal $command all creatools creatools-install` == true ] ; then
     echo " "
     echo " "
     echo " "
-    echo "Close this window and continue...."
-    echo " "
+    echo "Open a new terminal to run creatools."
+    echo "(Close this window and continue....) "
     echo " "
     echo " "
     read -p "Press [Enter] key to continue..."