From 66e65a64ca540a19439b73f080c6c1a66eefe443 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Mon, 28 Feb 2011 18:25:43 +0000 Subject: [PATCH] fix installprefix --- Linux/scripts/CreaTools-install.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index da28921..beb54c4 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -9,7 +9,7 @@ then cd $scriptDir bash installmod.sh $buildType $creasource $generationdir bash installmod.sh $buildType $bbtksource $generationdir - bash installmod.sh $buildType $creamaracassource $generationdir + bash installmod.sh $buildType $creamaracassource $generationdir bash installmod.sh $buildType $creaenvironmentsource $generationdir bash installmod.sh $buildType $creabrukersource $generationdir bash installmod.sh $buildType $creaimagesource $generationdir @@ -36,14 +36,16 @@ then export ETC_BASHRC="/etc/bashrc" fi - # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' if any + # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_librariy_config.sh' if any sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC - sed -i -e '/installPrefix=*/ d' $ETC_BASHRC + sed -i -e '/installPrefixtmp*/ d' $ETC_BASHRC # modify /etc/bashrc (we cannot modify .bashrc, since we switched as root) - # - add line 'bash $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' + # - add line 'bash $installPrefix/creatools_install/share/creatools_base_librariy_config.sh' + +echo installPrefixtmp=$installPrefix >> $ETC_BASHRC +echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] && source $installPrefixsharetmp/creatools_base_library_config.sh' >> $ETC_BASHRC + - echo source $installPrefix/share/creatools_base_library_config.sh >> $ETC_BASHRC - echo installPrefix=$installPrefix >> $ETC_BASHRC else echo echo "..ERROR.." -- 2.45.1