From d2c70c582c0e90c66eacd843115b628d538480d0 Mon Sep 17 00:00:00 2001
From: Guy Courbebaisse <guy.courbebaisse@creatis.insa-lyon.fr>
Date: Tue, 4 Jan 2011 16:32:38 +0000
Subject: [PATCH] *** empty log message ***

---
 Install/scripts/configure.sh    |  2 +-
 Install/scripts/installmod.sh   |  2 +-
 Install/scripts/make-install.sh | 86 +++++++++++++++------------------
 3 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/Install/scripts/configure.sh b/Install/scripts/configure.sh
index a7163e0..65657e2 100644
--- a/Install/scripts/configure.sh
+++ b/Install/scripts/configure.sh
@@ -40,7 +40,7 @@ exit 0
 fi
 
 generationdir=$1
-docGeneration=$2
+docgeneration=$2
 cvsUserName=$3
 installPrefix=$4
 buildType=$5
diff --git a/Install/scripts/installmod.sh b/Install/scripts/installmod.sh
index cdb0576..f923663 100644
--- a/Install/scripts/installmod.sh
+++ b/Install/scripts/installmod.sh
@@ -17,7 +17,7 @@ echo $3
 # We install, now
 
 pwd
-sudo make install
+make install
 cd ../..
 pwd
 
diff --git a/Install/scripts/make-install.sh b/Install/scripts/make-install.sh
index 475cebd..9de46bb 100644
--- a/Install/scripts/make-install.sh
+++ b/Install/scripts/make-install.sh
@@ -1,53 +1,43 @@
 #!/bin/sh
 
-echo
-echo
-echo "==================================================="
-echo "REMEMBER !"
-echo ""
-echo "YOU NEED TO RUN THIS ONE AS root"
-echo "==================================================="
-echo
-echo
-
-# Set all local variables
-
-source $PWD/configure.sh
-
-cd $scriptDir
-
- sh installmod.sh $buildType $creasource                   $generationdir  
- sh installmod.sh $buildType $bbtksource                   $generationdir
- sh installmod.sh $buildType $creamaracassource            $generationdir  
- sh installmod.sh $buildType $creaenvironmentsource        $generationdir
- sh installmod.sh $buildType $creabrukersource             $generationdir
- sh installmod.sh $buildType $creaimagesource              $generationdir
- sh installmod.sh $buildType $creacontourssource           $generationdir
- sh installmod.sh $buildType $crearigidregistrationssource $generationdir
- sh installmod.sh $buildType $bbtkgeditorsource            $generationdir
- sh installmod.sh $buildType $creatoolssource              $generationdir 
 
+if [ $UID = 0 ] 
+then
+  # Set all local variables
+  source $PWD/configure.sh
+  cd $scriptDir
+  sh installmod.sh $buildType $creasource                   $generationdir  
+  sh installmod.sh $buildType $bbtksource                   $generationdir
 exit 0
+  sh installmod.sh $buildType $creamaracassource            $generationdir  
+  sh installmod.sh $buildType $creaenvironmentsource        $generationdir
+  sh installmod.sh $buildType $creabrukersource             $generationdir
+  sh installmod.sh $buildType $creaimagesource              $generationdir
+  sh installmod.sh $buildType $creacontourssource           $generationdir
+  sh installmod.sh $buildType $crearigidregistrationssource $generationdir
+  sh installmod.sh $buildType $bbtkgeditorsource            $generationdir
+  sh installmod.sh $buildType $creatoolssource              $generationdir 
+  touch     $installPrefix/share/creatools_base_library_config.sh
+  rm        $installPrefix/share/creatools_base_library_config.sh
+  touch     $installPrefix/share/creatools_base_library_config.sh
+  chmod 755 $installPrefix/share/creatools_base_library_config.sh
+  echo export PATH='$'PATH:$installPrefix/bin                                   >> $installPrefix/share/creatools_base_library_config.sh
+  echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
+  echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
+  #  modify .bashrc
+  # - remove line 'sh $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh' if any (with accurate value for ???)
+  sed -i -e '/.*creatools_base_library_config.*/ d' /etc/bashrc 
+  # - add line 'sh $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' (with accurate value for ???)
+  echo source $installPrefix/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 
 
-
-CREATOOLS_INSTALL_DIR=$installPrefix
-rm        $CREATOOLS_INSTALL_DIR/share/creatools_base_library_config.sh
-touch     $CREATOOLS_INSTALL_DIR/share/creatools_base_library_config.sh
-chmod 666 $CREATOOLS_INSTALL_DIR/share/creatools_base_library_config.sh
-
-#######################################
-
-touch     $installPrefix/share/creatools_base_library_config.sh
-chmod 666 $installPrefix/share/creatools_base_library_config.sh
-
-
-echo export PATH='$'PATH:$installPrefix/bin                                   >> $installPrefix/share/creatools_base_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
-
-#  modify .bashrc
-# - remove line 'sh $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh' if any (with accurate value for ???)
-sed -i -e '/.*creatools_base_library_config.*/ d' ~/.bashrc
-
-# - add line 'sh $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' (with accurate value for ???)
-echo source $installPrefix/share/creatools_base_library_config.sh >> ~/.bashrc 
-- 
2.47.1