From 81fc43b38f65b89ae5f601c82221fbd7de46145c Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 2 Mar 2011 14:14:50 +0000 Subject: [PATCH] Don't check if root when CreaTools-install --- Linux/menu.sh | 48 +++++++++++++++++------------- Linux/scripts/CreaTools-install.sh | 26 ++++++++-------- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/Linux/menu.sh b/Linux/menu.sh index 4c5162d..de397d6 100644 --- a/Linux/menu.sh +++ b/Linux/menu.sh @@ -365,28 +365,34 @@ do fi ;; - 4) - 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 - fi + 4) + +# 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 +# fi + echo "========================= 4" - bash scripts/CreaTools-install.sh - if [ $UID != 0 ] - then - echo "You HAVE to leave current window to continue!" - else - echo "==> Hit any key to close current window" - fi + bash scripts/CreaTools-install.sh + + +# if [ $UID != 0 ] +# then +# echo "You HAVE to leave current window to continue!" +# else +# echo "==> Hit any key to close current window" +# fi + + echo "You HAVE to leave current window to continue!" read a kill $PPID diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index ffb7b82..d158172 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -1,7 +1,7 @@ #!/bin/bash -if [ $UID = 0 ] -then +#if [ $UID = 0 ] +#then # Set all local variables source $PWD/scripts/CreaTools-configure.sh source $PWD/scripts/CreaTools-names.sh @@ -46,15 +46,15 @@ echo installPrefixtmp=$installPrefix >> $ETC_BASHRC echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] && source $installPrefixtmp/share/creatools_base_library_config.sh' >> $ETC_BASHRC -else - echo - echo "..ERROR.." - echo "===================================================" - echo "REMEMBER !" - echo "" - echo "YOU NEED TO RUN THIS ONE AS root" - echo "===================================================" - echo - echo -fi +#else +# echo +# echo "..ERROR.." +# echo "===================================================" +# echo "REMEMBER !" +# echo "" +# echo "YOU NEED TO RUN THIS ONE AS root" +# echo "===================================================" +# echo +# echo +#fi -- 2.45.1