Browse Source

Fix directory issue with multiple fw_depends

Hamilton Turner 11 years ago
parent
commit
a0a9042789
1 changed files with 5 additions and 0 deletions
  1. 5 0
      toolset/setup/linux/bash_functions.sh

+ 5 - 0
toolset/setup/linux/bash_functions.sh

@@ -59,6 +59,8 @@ fw_depends() {
     trap 'fw_traperror $depend $? $LINENO "$BASH_COMMAND" $(printf ":%s" ${FUNCNAME[@]}) $(printf ":%s" ${BASH_SOURCE[@]}) $(printf ":%s" ${BASH_LINENO[@]})'  ERR
     retcode=0
 
+    # Ensure we are inside the installer root for this framework
+    cd $IROOT
     wd=$(pwd)
     relative_wd=\$FWROOT${wd#$FWROOT}
 
@@ -96,6 +98,9 @@ fw_depends() {
   set +E
   trap - ERR
 
+  # Politely return to IROOT for later install.sh code
+  cd $IROOT  
+
   return $FW_any_errors
 }