r3336 - in jhalfs/trunk/common: . libs

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Mar 19 11:27:00 PDT 2007


Author: manuel
Date: 2007-03-19 12:27:00 -0600 (Mon, 19 Mar 2007)
New Revision: 3336

Modified:
   jhalfs/trunk/common/libs/func_wrt_Makefile
   jhalfs/trunk/common/progress_bar.sh
Log:
Don't mess with SHELL settings.

Modified: jhalfs/trunk/common/libs/func_wrt_Makefile
===================================================================
--- jhalfs/trunk/common/libs/func_wrt_Makefile	2007-03-18 10:59:28 UTC (rev 3335)
+++ jhalfs/trunk/common/libs/func_wrt_Makefile	2007-03-19 18:27:00 UTC (rev 3336)
@@ -105,7 +105,7 @@
 
 $i:  $PREV
 	@\$(call echo_message, Building)
-	@export SHELL=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
+	@export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
 	@echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@
 	@\$(PRT_DU) >>logs/\$@
 EOF
@@ -122,7 +122,7 @@
 
 $i:  $PREV
 	@\$(call echo_message, Building)
-	@export SHELL=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
+	@export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
 	@echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@
 	@\$(PRT_DU_CR) >>logs/\$@
 EOF

Modified: jhalfs/trunk/common/progress_bar.sh
===================================================================
--- jhalfs/trunk/common/progress_bar.sh	2007-03-18 10:59:28 UTC (rev 3335)
+++ jhalfs/trunk/common/progress_bar.sh	2007-03-19 18:27:00 UTC (rev 3336)
@@ -24,10 +24,10 @@
 declare -i  PREV_SEC=0
 
 # Prevent segfault on stripping phases
-if [[ "$SHELL" = "/bin/bash" ]] ; then
+if [[ "$BASHBIN" = "/tools/bin/bash" ]] ; then
+  SLEEP=/tools/bin/sleep
+else
   SLEEP=/bin/sleep
-else
-  SLEEP=/tools/bin/sleep
 fi
 
 write_or_exit() {




More information about the alfs-log mailing list