X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Finstallscript;h=70fb2846b2fff369df4bc54e9d45b91e0d15c5bb;hb=f513924db3c927ac3c0e765731487572f25fcf1c;hp=c20e72e7a930687a90710e2328f88c33e2e5eab6;hpb=5808bbd8f0c5422f781e5f9ffb31fb650e649817;p=creaToolsTools.git
diff --git a/Linux/installscript b/Linux/installscript
index c20e72e..70fb284 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -23,6 +23,8 @@
#!/bin/bash -e
+scriptDirName=$(dirname $(readlink -f $0) )
+
#########################################################################
############ Local Functions #######################################
#########################################################################
@@ -206,6 +208,7 @@ function usage {
echo " -instprefix
: creatools install prefix"
echo " -instprefix3 : 3rd party library install prefix"
echo " -git : get creatools from git (CREATIS user only)"
+ echo " -git-read-only : get creatools from git (anonymously, no write access)"
echo " -build : build type Release, RelWithDebug or Debug (default RelWithDebug)"
echo ""
echo " experimental configure options (use at your own risk!!):"
@@ -227,6 +230,8 @@ while [ $# -ge 1 ] ; do
-instprefix3) installPrefixThird=$2; shift 2;;
-doc) docgeneration=ON; shift 1;;
-git) sourcesFrom=GIT; shift 1;;
+ -git-read-only) sourcesFrom=GIT-READ-ONLY;
+shift 1;;
-gdcm2) gdcmVersion=GDCM2; shift 1;;
-itk4) ITKVersion=ITK4; shift 1;;
-build) buildType=$2; shift 2;;
@@ -334,26 +339,30 @@ 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
+
# vtk
if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
bigDisplay "INSTALL VTK"
- bash scripts/ThirdParty-install-VTK.sh
+ source scripts/ThirdParty-install-VTK.sh
+ cd $scriptDirName
fi
# gdcm
if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
bigDisplay "INSTALL $gdcmVersion"
- bash scripts/ThirdParty-install-gdcm.sh
+ source scripts/ThirdParty-install-gdcm.sh
+ cd $scriptDirName
fi
# itk
@@ -390,7 +399,7 @@ fi
if [ `checkVal $command all creatools creatools-cmp` == true ] ; then
bigDisplay "COMPILE CREATOOLS"
source $ETC_BASHRC
- bash -x scripts/CreaTools-compile.sh
+ bash -x scripts/CreaTools-compile.sh
# To allow (*very* aware) user to patch code, later
if [ ! -e $generationdir/creatools_source ] ; then