diff --git a/bin/sailfishos-chum-gui-installer b/bin/sailfishos-chum-gui-installer index d7d87ea..2ab1909 100644 --- a/bin/sailfishos-chum-gui-installer +++ b/bin/sailfishos-chum-gui-installer @@ -72,7 +72,7 @@ source /etc/os-release; logentry="[Debug] From /etc/os-release: $ID $VERSION_ID printf '\n%s\n' "$(date -Iseconds) $logentry" systemd-cat -t "$called" -p 7 printf '%s' "$logentry" -ssus="$(ssu s | grep -iv 'UID:\? ')"; logentry='[Debug] \`ssu status\`, UID omitted:' +ssus="$(ssu s | grep -iv 'UID:\? ')"; logentry='[Debug] `ssu status`, UID omitted:' printf '\n%s\n%s\n' "$(date -Iseconds) $logentry" "$ssus" systemd-cat -t "$called" -p 7 printf '%s %s' "$logentry" "$(printf '%s' "$ssus" | sed 's/$/, /g' | tr -d '\n')" @@ -227,7 +227,7 @@ logentry='pkcon -pvy install sailfishos-chum-gui' # except for the final log message. setsid --fork sh -c '(sleep 1;\ i=0; while [ $i -le 9 ] && ps -eo pid | fgrep -q "$1"; do sleep 1; i=$(($i+1)); done;\ - printf '\n%s\n' "$(date -Iseconds) [Step 2 / 2] $2";\ + printf "\n%s\n" "$(date -Iseconds) [Step 2 / 2] $2";\ systemd-cat -t "$3" -p 6 printf '%s' "[Info] Executing: $2";\ eval $2)' sh_do_inst-chum-gui "$mypid" "$logentry" "$called" # The first 15 characters of the spawned process' name @@ -239,7 +239,7 @@ setsid --fork sh -c '(sleep 1;\ # For a detailed description of double-forking in shell code, see # https://github.com/storeman-developers/harbour-storeman-installer/blob/master/double-fork-in-shell.md logentry="[Debug] ${called}'s main script (PID: ${mypid}) finishes" -printf '\n%s\n' "$(date -Iseconds) $logentry" +printf '\n%s\n' "$(date -Iseconds) ${logentry}." systemd-cat -t "$called" -p 7 printf '%s' "$logentry" exit $retc