From 7b397dfd461961b30f93595a44b9353f7ec15cb4 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 12 Jan 2011 16:53:17 +0000 Subject: [PATCH] re indent --- Linux/menu.sh | 435 ++++++++++++++--------------- Linux/scripts/CreaTools-install.sh | 2 +- 2 files changed, 218 insertions(+), 219 deletions(-) diff --git a/Linux/menu.sh b/Linux/menu.sh index ca8e420..814f980 100644 --- a/Linux/menu.sh +++ b/Linux/menu.sh @@ -2,42 +2,42 @@ if [ $UID != 0 ] then - echo - echo "..ERROR.." - echo "===================================================" - echo "REMEMBER !" - echo "" - echo "YOU NEED TO RUN THIS ONE AS root" - echo "===================================================" - echo - echo - exit 0 + echo + echo "..ERROR.." + echo "===================================================" + echo "REMEMBER !" + echo "" + echo "YOU NEED TO RUN THIS ONE AS root" + echo "===================================================" + echo + echo + exit 0 +fi -else - i=999 + +i=999 while [ $i != 9 ] do + echo + echo + echo + echo " MENU" + echo + echo " Choose what you want to do :" + echo + echo " Configure : 0" + echo " Install Third Party Libraries : 1" + echo " Compile the CreaTools : 2" + echo " Install the CreaTools : 3" + echo " Uninstall the CreaTools : 4" + echo + echo " Exit : 9" + echo + echo + echo -echo -echo -echo -echo " MENU" -echo -echo " Choose what you want to do :" -echo -echo " Configure : 0" -echo " Install Third Party Libraries : 1" -echo " Compile the CreaTools : 2" -echo " Install the CreaTools : 3" -echo " Uninstall the CreaTools : 4" -echo -echo " Exit : 9" -echo -echo -echo - -echo "Type in your choice :" -read i + echo "Type in your choice :" + read i case $i in 0) @@ -52,7 +52,7 @@ read i echo "------------------------" more scripts/CreaTools-configure.sh echo "------------------------" - echo "Are the following values suitable for you : YES/NO (default is YES)?" + echo "Are the following values suitable for you : YES/NO? (default is YES)" read suitable if [ "$suitable" = "" ] then @@ -62,206 +62,205 @@ read i else $suitable="NO" fi - + if [ "$suitable" = "NO" ] then -echo -echo - confirm="NO" - while [ "$confirm" != "YES" ] - do - OperatingSystem="XXX" - while [[ "$OperatingSystem" != "Fedora" && \ - "$OperatingSystem" != "Ubuntu" && \ - "$OperatingSystem" != "MacOS" ]] - do - echo "Operating System : Fedora/Ubuntu/MacOS (mandatory!)" - read OperatingSystem - done - echo "you said : [" $OperatingSystem "]" -echo -echo - # ------------------ - - - # ------------------ - echo "Name of the Generation Directory (default is /tmp/myGenerationDir)" - read generationdir - if [ "$generationdir" = "" ] - then - generationdir="/tmp/myGenerationDir" - fi - echo "you said : [" $generationdir "]"su - -echo -echo - # ------------------ + echo + echo + confirm="NO" + while [ "$confirm" != "YES" ] + do + OperatingSystem="XXX" + while [[ "$OperatingSystem" != "Fedora" && \ + "$OperatingSystem" != "Ubuntu" && \ + "$OperatingSystem" != "MacOS" ]] + do + echo "Operating System : Fedora/Ubuntu/MacOS (mandatory!)" + read OperatingSystem + done + echo "you said : [" $OperatingSystem "]" + echo + echo - installPrefix="XXX" - echo "Install Prefix : '$generationdir/creatools_install' / '/usr/local' (default is '$generationdir/creatools_install')" - read installPrefix - if [ "$installPrefix" = "" ] - then - installPrefix="$generationdir/creatools_install" - fi - echo "you said : [" $installPrefix "]" -echo -echo - # ------------------ - docgeneration="XXX" - while [[ "$docgeneration" != "YES" && "$docgeneration" != "NO" ]] - do - echo "Boolean For Doc Generation : YES/NO (default is NO)" - read docgeneration - if [ "$docgeneration" = "" ] - then - docgeneration="NO" - fi - echo "you said : [" $docgeneration "]" - done -echo -echo - # ------------------ + # ------------------ + echo "Name of the Generation Directory (default is /tmp/myGenerationDir)" + read generationdir + if [ "$generationdir" = "" ] + then + generationdir="/tmp/myGenerationDir" + fi + echo "you said : [" $generationdir "]"su - sourcesFrom="XXX" - while [[ "$sourcesFrom" != "CVS" && "$sourcesFrom" != "HTML" ]] - do - echo "Where do you want to get source files from : CVS/HTML (default is HTML)" - read sourcesFrom - if [ "$sourcesFrom" = "" ] - then - sourcesFrom="HTML" - fi - echo "you said : [" $sourcesFrom "]" - done -echo -echo - # ------------------ - - cvsUserName="" - if [ "$sourcesFrom" = "CVS" ] - then - while [ "$cvsUserName" == "" ] - do - echo "CVS User Name (mandatory!)" - read cvsUserName - done - echo "you said : [" $cvsUserName "]" - else - cvsUserName="ForgetThisOne" - fi -echo -echo - # ------------------ + echo + echo + # ------------------ - linuxUserName="" - while [ "$linuxUserName" == "" ] - do - echo "Have a look at the following line to know 'Login User Name'/'Login Group Name'" - ls -l .bashrc - echo "Login User Name (mandatory!)" - read linuxUserName - echo "you said : [" $linuxUserName "]" - done -echo -echo + installPrefix="XXX" + echo "Install Prefix : '$generationdir/creatools_install' / '/usr/local' (default is '$generationdir/creatools_install')" + read installPrefix + if [ "$installPrefix" = "" ] + then + installPrefix="$generationdir/creatools_install" + fi + echo "you said : [" $installPrefix "]" + echo + echo + # ------------------ - linuxGroupName="" - while [ "$linuxGroupName" == "" ] - do - echo "Have a look at the following line to know 'Login User Name'/'Login Group Name'" - echo "Login Group Name (mandatory!)" - read linuxGroupName - echo "you said : [" $linuxGroupName "]" - done -echo -echo - # ------------------ - - buildType="XXX" - while [[ "$buildType" != "Release" && "$Debug " != "HTML" ]] - do - echo "Build type : Release/Debug (default is Release)" - read buildType - if [ "$buildType" = "" ] - then - buildType="Release" - fi - echo "you said : [" $buildType "]" - done -echo -echo - # ------------------ - - gdcmVersion="XXX" - while [[ "$gdcmVersion" != "GDCM1" && "$gdcmVersion " != "GDCM2" ]] - do - echo "Gdcm version : GDCM1/GDCM2 (default is GDCM1)" - read gdcmVersion - if [ "$gdcmVersion" = "" ] - then - gdcmVersion="GDCM1" - fi - echo "you said : [" $gdcmVersion "]" - done -echo -echo -echo -echo -echo "You said :" -echo " Operating System : $OperatingSystem" -echo " Name of the Generation Directory : $generationdir" -echo " Install Prefix : $installPrefix" -echo " Boolean For Doc Generation : $docgeneration" -echo " Where do you want to get source files from : $sourcesFrom" -if [ $sourcesFrom = CVS ] -then -echo " CVS User Name : $cvsUserName" -fi -echo " Login User Name : $linuxUserName" -echo " Login Group Name : $linuxGroupName" -echo " Build type : $buildType" -echo " Gdcm version : $gdcmVersion" -echo -echo -echo "Do you confirm your choices : YES/NO ? (default is NO)" -read confirm -done + docgeneration="XXX" + while [[ "$docgeneration" != "YES" && "$docgeneration" != "NO" ]] + do + echo "Boolean For Doc Generation : YES/NO (default is NO)" + read docgeneration + if [ "$docgeneration" = "" ] + then + docgeneration="NO" + fi + echo "you said : [" $docgeneration "]" + done + echo + echo + # ------------------ + + sourcesFrom="XXX" + while [[ "$sourcesFrom" != "CVS" && "$sourcesFrom" != "HTML" ]] + do + echo "Where do you want to get source files from : CVS/HTML (default is HTML)" + read sourcesFrom + if [ "$sourcesFrom" = "" ] + then + sourcesFrom="HTML" + fi + echo "you said : [" $sourcesFrom "]" + done + echo + echo + # ------------------ + + cvsUserName="" + if [ "$sourcesFrom" = "CVS" ] + then + while [ "$cvsUserName" == "" ] + do + echo "CVS User Name (mandatory!)" + read cvsUserName + done + echo "you said : [" $cvsUserName "]" + else + cvsUserName="ForgetThisOne" + fi + echo + echo + # ------------------ + + linuxUserName="" + while [ "$linuxUserName" == "" ] + do + echo "Have a look at the following line to know 'Login User Name'/'Login Group Name'" + ls -l ~/.bashrc + echo "Login User Name (mandatory!)" + read linuxUserName + echo "you said : [" $linuxUserName "]" + done + echo + echo - # GROS SOUCIS : Ou creer le fichier CreaTools-configure.sh? + linuxGroupName="" + while [ "$linuxGroupName" == "" ] + do + #echo "Have a look at the following line to know 'Login User Name'/'Login Group Name'" + #echo "Login Group Name (mandatory!)" + read linuxGroupName + echo "you said : [" $linuxGroupName "]" + done + echo + echo + # ------------------ + + buildType="XXX" + while [[ "$buildType" != "Release" && "$Debug " != "HTML" ]] + do + echo "Build type : Release/Debug (default is Release)" + read buildType + if [ "$buildType" = "" ] + then + buildType="Release" + fi + echo "you said : [" $buildType "]" + done + echo + echo + # ------------------ + + gdcmVersion="XXX" + while [[ "$gdcmVersion" != "GDCM1" && "$gdcmVersion " != "GDCM2" ]] + do + echo "Gdcm version : GDCM1/GDCM2 (default is GDCM1)" + read gdcmVersion + if [ "$gdcmVersion" = "" ] + then + gdcmVersion="GDCM1" + fi + echo "you said : [" $gdcmVersion "]" + done + echo + echo + echo + echo + echo "You said :" + echo " Operating System : $OperatingSystem" + echo " Name of the Generation Directory : $generationdir" + echo " Install Prefix : $installPrefix" + echo " Boolean for Doc Generation : $docgeneration" + echo " Where do you want to get source files from : $sourcesFrom" + if [ $sourcesFrom = CVS ] + then + echo " CVS User Name : $cvsUserName" + fi + echo " Login User Name : $linuxUserName" + echo " Login Group Name : $linuxGroupName" + echo " Build type : $buildType" + echo " Gdcm version : $gdcmVersion" + echo + echo + echo "Do you confirm your choices : YES/NO ? (default is NO)" + read confirm + done + + # GROS SOUCIS : Ou generer le fichier CreaTools-configure.sh? # dans $generationdir/creatools_bin ? # -> il n'est pas encore cree ! # dans ./Linux/scripts? # -> ? -configureFile="scripts/CreaTools-configure.sh" -touch $configureFile -echo "#!/bin/sh" > $configureFile -echo >> $configureFile -echo "#File generated by 'menu.sh'" >> $configureFile -echo "#DO NOT edit !" >> $configureFile -echo "#(except if you *know* what you do)">> $configureFile -echo >> $configureFile -echo "OperatingSystem=$OperatingSystem" >> $configureFile -echo "generationdir=$generationdir" >> $configureFile -echo "installPrefix=$installPrefix" >> $configureFile -echo "docgeneration=$docgeneration" >> $configureFile -echo "sourcesFrom=$sourcesFrom" >> $configureFile -echo "cvsUserName=$cvsUserName" >> $configureFile -echo "loginUserName=$linuxUserName" >> $configureFile -echo "loginGroupName=$linuxGroupName" >> $configureFile -echo "buildType=$buildType" >> $configureFile -echo "gdcmVersion=$gdcmVersion" >> $configureFile + configureFile="scripts/CreaTools-configure.sh" + touch $configureFile + echo "#!/bin/sh" > $configureFile + echo >> $configureFile + echo "#File generated by 'menu.sh'" >> $configureFile + echo "#DO NOT edit !" >> $configureFile + echo "#(except if you *know* what you do)">> $configureFile + echo >> $configureFile + echo "OperatingSystem=$OperatingSystem" >> $configureFile + echo "generationdir=$generationdir" >> $configureFile + echo "installPrefix=$installPrefix" >> $configureFile + echo "docgeneration=$docgeneration" >> $configureFile + echo "sourcesFrom=$sourcesFrom" >> $configureFile + echo "cvsUserName=$cvsUserName" >> $configureFile + echo "loginUserName=$linuxUserName" >> $configureFile + echo "loginGroupName=$linuxGroupName" >> $configureFile + echo "buildType=$buildType" >> $configureFile + echo "gdcmVersion=$gdcmVersion" >> $configureFile # ------------------ -# endif 'suitable' -fi + # endif 'suitable' + fi ;; 1) - echo "========================== $i " + echo "========================== 1 " sh scripts/ThirdParty-install.sh vtkdirVariable="" @@ -301,7 +300,7 @@ fi ;; 2) - echo "========================== $i" + echo "========================== 2" sh scripts/CreaTools-compile.sh # To allow (*very* aware) user to patch code, later @@ -313,12 +312,12 @@ fi ;; 3) - echo "========================= $i" + echo "========================= 3" sh scripts/CreaTools-install.sh ;; 4) - echo "========================= $i" + echo "========================= 4" sh scripts/CreaTools-uninstall.sh ;; @@ -332,4 +331,4 @@ fi esac done -fi + diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index 6fa0875..008140e 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -3,7 +3,7 @@ if [ $UID = 0 ] then - # Set all local variables + # Set all local variables source $PWD/scripts/CreaTools-configure.sh source $PWD/scripts/CreaTools-names.sh -- 2.45.1