From c41cbc63521d5a4725add5390ebba82bda14a30a Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 19 Jun 2020 10:56:55 +0200 Subject: [PATCH] #3444 creaToolsTools Feature New Normal - Install Generique Linux --- Linux/scripts/CreaTools-GenerateBinTGZ.sh | 59 ++++++++++++++--------- Linux/scripts/Install-Creatools-Bin.sh | 29 ++++++++--- 2 files changed, 58 insertions(+), 30 deletions(-) diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh index d59b1a5..1dc5f73 100644 --- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh +++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh @@ -71,17 +71,29 @@ echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$1/lib64" >> share/creatools/creatools_TPLaux_config.sh cp $scriptDir/TPLaux-bashrc.sh share/creatools/TPLaux-bashrc.sh cd lib64 - cp /usr/lib64/libwx*-3.0.so.0 . - cp /usr/lib64/libboost_*.so.1.69.0 . - cp /usr/lib64/libm.so.6 . - cp /usr/lib64/libstdc++.so.6 . - cp /usr/lib64/libSDL2-2.0.so.0 . - cp /usr/lib64/libmspack.so.0 . - cp /usr/lib64/libjpeg.so.62 . - cp /usr/lib64/libicudata.so.63 . - cp /usr/lib64/libicui18n.so.63 . - cp /usr/lib64/libicuuc.so.63 . - cp /usr/lib64/libc.so.6 libc.so.6-EED + +# Fedora 31 + if [ `getDistribVersion` == 31 ] ; then + cp /usr/lib64/libwx*-3.0.so.0 . + cp /usr/lib64/libboost_*.so.1.69.0 . + cp /usr/lib64/libm.so.6 . + cp /usr/lib64/libstdc++.so.6 . + cp /usr/lib64/libSDL2-2.0.so.0 . + cp /usr/lib64/libmspack.so.0 . + cp /usr/lib64/libjpeg.so.62 . + cp /usr/lib64/libicudata.so.63 . + cp /usr/lib64/libicui18n.so.63 . + cp /usr/lib64/libicuuc.so.63 . + fi + +# Fedora 28 + if [ `getDistribVersion` == 28 ] ; then + cp /usr/lib64/libwx*-3.0.so.0 . + cp /usr/lib64/libboost_*.so.1.66.0 . + cp /usr/lib64/libjpeg.so.62 . + cp /usr/lib64/libSDL2-2.0.so.0 . + cp /usr/lib64/libmspack.so.0 . + fi cd ../.. fileTGZaux=$creatoolsTPLaux-`getDistrib`-`getDistribVersion`.tgz @@ -89,10 +101,11 @@ tar -cvzf $fileTGZaux $creatoolsTPLaux scp $fileTGZaux $distanceAdress/$fileTGZaux - - + fileTGZf28=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-Fedora-28.tgz + fileTGZauxf28=$creatoolsTPLaux-Fedora-28.tgz + #--------Script de Instalation : creatools-Linux-Bin-x.x.x.sh -------------------------------------------------------- @@ -108,13 +121,13 @@ echo "ETC_BASHRC=\`getbashrc\`" >> $filename_BinVersion - echo "if [ \"\$1\" = \"Final_User\" ] ; then" >> $filename_BinVersion - echo " \`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZ" >> $filename_BinVersion - echo " tar -xvzf $fileTGZ" >> $filename_BinVersion - echo " rm -f $fileTGZ" >> $filename_BinVersion - echo " \`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZaux" >> $filename_BinVersion - echo " tar -xvzf $fileTGZaux" >> $filename_BinVersion - echo " rm -f $fileTGZaux" >> $filename_BinVersion + echo "if [ \"\$1\" = \"FinalUser\" ] ; then" >> $filename_BinVersion + echo " \`getDownloadCommand\` http://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 " 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 @@ -156,15 +169,15 @@ #----------------------------------------------------------------- cat $scriptDir/Install-Creatools-Bin.sh-downloadTool $scriptDir/Install-Creatools-Bin.sh > Install-Creatools-Bin-tmp.sh - cat $scriptDir/Install-Creatools-Bin.sh-downloadTool $scriptDir/Install-Creatools-Final_User.sh > Install-Creatools-Final_User-tmp.sh +## cat $scriptDir/Install-Creatools-Bin.sh-downloadTool $scriptDir/Install-Creatools-Final_User.sh > Install-Creatools-Final_User-tmp.sh scp Install-Creatools-Bin-tmp.sh $distanceAdress/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh - scp Install-Creatools-Final_User-tmp.sh $distanceAdress/Install-Creatools-Final_User-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh + ## scp Install-Creatools-Final_User-tmp.sh $distanceAdress/Install-Creatools-Final_User-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Bin-Release.sh; ln -s v4.x.x/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh Install-Creatools-Bin-Release.sh" ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm creatools-Linux-Bin.sh; ln -s v4.x.x/$filename_BinVersion creatools-Linux-Bin.sh" - ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Final_User.sh; ln -s v4.x.x/Install-Creatools-Final_User-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh Install-Creatools-Final_User.sh" +## ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Final_User.sh; ln -s v4.x.x/Install-Creatools-Final_User-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh Install-Creatools-Final_User.sh" echo "" diff --git a/Linux/scripts/Install-Creatools-Bin.sh b/Linux/scripts/Install-Creatools-Bin.sh index 3150f01..b7fdcb8 100755 --- a/Linux/scripts/Install-Creatools-Bin.sh +++ b/Linux/scripts/Install-Creatools-Bin.sh @@ -1,10 +1,25 @@ -CREATOOLSBINDIR=Creatools-Bin -rm -rf $CREATOOLSBINDIR -mkdir $CREATOOLSBINDIR -cd $CREATOOLSBINDIR -$downloadCommand http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/creatools-Linux-Bin.sh -source creatools-Linux-Bin.sh -cd .. + +if [ "$#" -ne 1 ]; then + echo " Help: Install-Creatools-Bin.sh [pkg-dev|FinalUser]" + echo +else + CREATOOLSBINDIR=Creatools-Bin + rm -rf $CREATOOLSBINDIR + mkdir $CREATOOLSBINDIR + cd $CREATOOLSBINDIR + $downloadCommand http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/creatools-Linux-Bin.sh + if [ "$1" = "pkg-dev" ]; then + echo "Installing creaTools pkg-dev ..." + source creatools-Linux-Bin.sh + elif [ "$1" = "FinalUser" ]; then + echo "Installing creaTools FinalUser ..." + source creatools-Linux-Bin.sh FinalUser + else + echo "Error. Input parameter" + fi + cd .. +fi + -- 2.45.1