Don't mess with SHELL settings.
This commit is contained in:
parent
ace81427f6
commit
c180dec974
2 changed files with 5 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -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() {
|
||||
|
|
Reference in a new issue