X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Finstallscript;h=851dce2046dae9c5df81dc4c1ca7c72b558f5814;hb=5eb2abdf96b753be13fd8bb56217f357c066e941;hp=4823c0227badd9a1d5e2d5d58eb9f5605343cb04;hpb=dbc17ccf7ebbbea53ee77802ea1c8667c01f8d9b;p=creaToolsTools.git diff --git a/Linux/installscript b/Linux/installscript index 4823c02..851dce2 100755 --- a/Linux/installscript +++ b/Linux/installscript @@ -149,14 +149,14 @@ generationdir=$HOME/CreatoolsGenerationDir installPrefixThird= installPrefix= docgeneration=OFF -sourcesFrom=HTML +sourcesFrom=GIT loginUserName=$USER loginGroupName=`groups | awk '{print $1}'` -buildType=RelWithDebug +buildType=Release gdcmVersion=GDCM1 ITKVersion=ITK3 -export ETC_BASHRC=`getbashrc` +export ETC_BASHRC=~/.bashrc @@ -339,11 +339,12 @@ fi if [ `checkVal $command all 3rd 3rd-base` == true ] ; then bigDisplay "INSTALL PACKAGES DEPENDENCIES" if [ "`whoami`" == root ] ; then - bash scripts/ThirdParty-install-Base-Stuff.sh + 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:"; - sudo su -c "bash scripts/ThirdParty-install-Base-Stuff.sh" + su -c "bash scripts/ThirdParty-install-Base-Stuff.sh" fi bash scripts/ThirdParty-install.sh fi @@ -379,7 +380,6 @@ fi if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then bigDisplay "FINALIZE 3RD PARTY LIBRARY INSTALLATION" bash scripts/ThirdParty-install-Finalize.sh - source $ETC_BASHRC if [ `checkVal $command 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then bigDisplay "Third Party Install Done" bigDisplay "Please copy paste the following command or open a new terminal: source ~/.bashrc"