Browse Source

Print bash commands for installer files

This, plus prior commits, fixes #1107
Hamilton Turner 10 years ago
parent
commit
0af3e623a4
1 changed files with 7 additions and 0 deletions
  1. 7 0
      toolset/setup/linux/bash_functions.sh

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

@@ -73,22 +73,29 @@ fw_depends() {
     wd=$(pwd)
     wd=$(pwd)
     relative_wd=\$FWROOT${wd#$FWROOT}
     relative_wd=\$FWROOT${wd#$FWROOT}
 
 
+    # Turn on bash tracing before sourcing installer files to 
+    # print commands before they run
     if [ -f $FWROOT/toolset/setup/linux/systools/${depend}.sh ]; then
     if [ -f $FWROOT/toolset/setup/linux/systools/${depend}.sh ]; then
       echo Installing system tool: $depend in $relative_wd
       echo Installing system tool: $depend in $relative_wd
+      set -x
       . $FWROOT/toolset/setup/linux/systools/${depend}.sh
       . $FWROOT/toolset/setup/linux/systools/${depend}.sh
     elif [ -f $FWROOT/toolset/setup/linux/languages/${depend}.sh ]; then
     elif [ -f $FWROOT/toolset/setup/linux/languages/${depend}.sh ]; then
       echo Installing language: $depend in $relative_wd
       echo Installing language: $depend in $relative_wd
+      set -x
       . $FWROOT/toolset/setup/linux/languages/${depend}.sh
       . $FWROOT/toolset/setup/linux/languages/${depend}.sh
     elif [ -f $FWROOT/toolset/setup/linux/webservers/${depend}.sh ]; then
     elif [ -f $FWROOT/toolset/setup/linux/webservers/${depend}.sh ]; then
       echo Installing webserver: $depend in $relative_wd
       echo Installing webserver: $depend in $relative_wd
+      set -x
       . $FWROOT/toolset/setup/linux/webservers/${depend}.sh
       . $FWROOT/toolset/setup/linux/webservers/${depend}.sh
     elif [ -f $FWROOT/toolset/setup/linux/frameworks/${depend}.sh ]; then
     elif [ -f $FWROOT/toolset/setup/linux/frameworks/${depend}.sh ]; then
       echo Installing framework: $depend in $relative_wd
       echo Installing framework: $depend in $relative_wd
+      set -x
       . $FWROOT/toolset/setup/linux/frameworks/${depend}.sh
       . $FWROOT/toolset/setup/linux/frameworks/${depend}.sh
     else
     else
       echo WARN: No installer found for $depend
       echo WARN: No installer found for $depend
       continue
       continue
     fi
     fi
+    set +x
 
 
     # For a sourced script to pass, all internal commands must return
     # For a sourced script to pass, all internal commands must return
     # non-zero. If you want to intentionally cause a failed install
     # non-zero. If you want to intentionally cause a failed install