Skip to content

Commit c8fda3f

Browse files
committed
fix
1 parent c2b88aa commit c8fda3f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

usr/bin/dist-installer-cli

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ update_sources() {
731731
update_cmd=( "${pkg_mngr_update[@]}" )
732732
fi
733733

734-
log info "update_cmd: '${update_cmd[*]}'"
734+
log info "update_cmd: '${update_cmd[*]}' | console_write_command: '${console_write_command[*]}'"
735735

736736
if update_output=$(root_cmd_loglevel=notice root_cmd "${update_cmd[@]}" 2>&1 | "${console_write_command[@]}") ; then
737737
log info "Package List Update: exit code '0' (OK)"
@@ -4408,19 +4408,19 @@ log_term_and_file() {
44084408
tty_output=''
44094409
## global console_write_command
44104410
if tty_output="$(tty 2>&1)" ; then
4411-
console_write_command=( 'tee' '--' '/dev/tty' )
4411+
console_write_command=( 'tee' '--' "${tty_output}" )
44124412
log info "Terminal: 'tty' connected: 'yes' (console_write_command: '${console_write_command[*]}')"
44134413
else
44144414
## github actions CI issue:
44154415
## tee: /dev/tty: No such device or address
44164416
## https://github.com/actions/runner/issues/241
44174417
console_write_command=( 'cat' '--' )
4418-
log info "Terminal: 'tty' connected: 'no' (tty_output: '${tty_output}' | console_write_command: '${console_write_command[*]}')"
4418+
log notice "Terminal: 'tty' connected: 'no' (tty_output: '${tty_output}' | console_write_command: '${console_write_command[*]}')"
44194419
fi
44204420

44214421
## Discover if terminal is attached to 'stdout'.
44224422
if [ ! -t 1 ]; then
4423-
log info "Terminal: 'stdout' connected: 'no' - Output is not being sent to the terminal because terminal is not connected to 'stdout'."
4423+
log notice "Terminal: 'stdout' connected: 'no' - Output is not being sent to the terminal because terminal is not connected to 'stdout'."
44244424
return 0
44254425
fi
44264426
log info "Terminal: 'stdout' connected: 'yes'"

0 commit comments

Comments
 (0)