#3405 vtk8itk5wx3-macos

[creaToolsTools.git] / Linux / scripts / CreaTools-GenerateBinTGZ.sh

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index 82097857aadc061b7927492a345fae3de5aff902..737a6da132633d94724d83b353940a8e8fb67742 100644 (file)
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -71,7 +71,13 @@
        mkdir share
        mkdir share/creatools
        echo "export PATH=\$PATH:\$1/bin" > share/creatools/creatools_TPLaux_config.sh
-       echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$1/lib64" >> share/creatools/creatools_TPLaux_config.sh
+# MacOs
+       if [ `getDistrib` == MacOS ]  ; then 
+               echo "export DYLD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$1/lib64" >> share/creatools/creatools_TPLaux_config.sh
+       else 
+               echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$1/lib64" >> share/creatools/creatools_TPLaux_config.sh
+       fi
+
        cp $scriptDir/TPLaux-bashrc.sh share/creatools/TPLaux-bashrc.sh
 
 # Fedora 31 
@@ -160,7 +166,7 @@
 ##     fileTGZf28=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-Fedora-28.tgz
 ##     fileTGZauxf28=$creatoolsTPLaux-Fedora-28.tgz
 
-       fileTGZf28=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-'$'FINALUSER.tgz
+       fileTGZf28=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-'$'VERFINALUSER.tgz
        fileTGZauxf28=$creatoolsTPLaux-'$'VERFINALUSER.tgz
 
 
@@ -180,24 +186,24 @@
      echo "ETC_BASHRC=\`getbashrc\`" >>  $filename_BinVersion
 
 
-         echo "if [ \"\$1\" = \"FinalUser\" ] ; then" >> $filename_BinVersion
-         echo "   if [ 'getDistrib' = Fedora ] ; then ">> $filename_BinVersion 
-         echo "     local VERFINALUSER=Fedora-28 ">> $filename_BinVersion 
+         echo "if [ \"\$1\" == \"FinalUser\" ] ; then" >> $filename_BinVersion
+         echo "   if [ \`getDistrib\` == Fedora ] ; then ">> $filename_BinVersion 
+         echo "     VERFINALUSER=Fedora-28 ">> $filename_BinVersion 
          echo "   fi ">> $filename_BinVersion 
-         echo "   if [ 'getDistrib' = MacOS ] ; then ">> $filename_BinVersion 
-         echo "     local VERFINALUSER=MacOS-10.11 ">> $filename_BinVersion 
+         echo "   if [ \`getDistrib\` == MacOS ] ; then ">> $filename_BinVersion 
+         echo "     VERFINALUSER=MacOS-10.11.6 ">> $filename_BinVersion 
          echo "   fi ">> $filename_BinVersion 
-         echo "   \`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZf28" >> $filename_BinVersion 
+         echo "   \`getDownloadCommand\` https://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZf28" >> $filename_BinVersion 
          echo "   tar -xvzf $fileTGZf28" >>  $filename_BinVersion
          echo "   rm -f $fileTGZf28" >>  $filename_BinVersion
-         echo "   \`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZauxf28" >> $filename_BinVersion 
+         echo "   \`getDownloadCommand\` https://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZauxf28" >> $filename_BinVersion 
          echo "   tar -xvzf $fileTGZauxf28" >>  $filename_BinVersion
          echo "   rm -f $fileTGZauxf28" >>  $filename_BinVersion
       echo "   installPrefixTPLaux=\$(pwd)/creatoolsTPLaux #You need this variable in the -barshrc script" >>  $filename_BinVersion
       echo "   source creatoolsTPLaux/share/creatools/TPLaux-bashrc.sh"  >>  $filename_BinVersion
 
          echo "else" >> $filename_BinVersion
-         echo "   \`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZstring.tgz" >> $filename_BinVersion 
+         echo "   \`getDownloadCommand\` https://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZstring.tgz" >> $filename_BinVersion 
          echo "   tar -xvzf $fileTGZstring.tgz" >>  $filename_BinVersion
          echo "   rm -f $fileTGZstring.tgz" >>  $filename_BinVersion
       echo "   OperatingSystem=\`getDistrib\`  #You need this variable in the Base-Stuff script" >>  $filename_BinVersion