zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't mess with SHELL settings.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2007-03-19 18:27:00 +00:00
parent ace81427f6
commit c180dec974
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/libs/func_wrt_Makefile
View file

@ -105,7 +105,7 @@ cat << EOF
$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 @@ cat << EOF
$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

6
common/progress_bar.sh
View file

@ -24,10 +24,10 @@ declare -i SEC=0 # Seconds accumulator
declare -i PREV_SEC=0
# Prevent segfault on stripping phases
if [[ "$SHELL" = "/bin/bash" ]] ; then
SLEEP=/bin/sleep
else
if [[ "$BASHBIN" = "/tools/bin/bash" ]] ; then
SLEEP=/tools/bin/sleep
else
SLEEP=/bin/sleep
fi
write_or_exit() {