osi-mk: Even better logging

1 files changed, 7 insertions, 4 deletions

diff --git a/osi-mk b/osi-mk
index 8d49223..4ba520f 100755
--- a/osi-mk
+++ b/osi-mk
@@ -147,10 +147,11 @@ main() {
 				if [[ -e "$arg_file" ]]; then
 					error 1 'Image file already exists, refusing to overwrite: %s' "$arg_file"
 				fi
+				printf -v prefix "$(gettext -- '%s [format]')" "$NAME"
 				{
 					truncate --size="$arg_size" -- "$arg_file"
 					mkfs.btrfs -- "$arg_file"
-				} |& sed "s|^|${NAME} [format] |"
+				} |& sed "s|^|${prefix} |"
 			fi
 			arg_mountpoint=$(mktemp -dt -- "${0##*/}.XXXXXXXXXX")
 			# shellcheck disable=SC2064
@@ -174,6 +175,7 @@ main() {
 			cache_packages+=("${packages[@]}")
 
 			#### Base install ###
+			printf -v prefix "$(gettext -- '%s [install]')" "$NAME"
 			{
 				# Pre-fill the package cache
 				mkdir -p -- "$arg_mountpoint"/var/{cache/pacman/pkg,lib/pacman,log}
@@ -186,14 +188,15 @@ main() {
 				# The --hookdir bit is to hack around https://bugs.archlinux.org/task/49347
 				pacstrap -M -C /usr/share/pacman/defaults/pacman.conf.x86_64 -- "$arg_mountpoint" \
 					 --hookdir="$arg_mountpoint/etc/pacman.d/hooks" "${packages[@]}"
-			} |& sed "s|^|${NAME} [install] |"
+			} |& sed "s|^|${prefix} |"
 
 			### post_install ###
 			while IFS=: read -r n fn; do
-				printf -v prefix '%s [post_install:%s:%s]' "$NAME" "$n" "$fn"
+				printf -v prefix "$(gettext -- '%s [post_install:%s:%s]')" "$NAME" "$n" "$fn"
 				{
-					echo Begin
+					print Begin
 					"$fn" "$arg_mountpoint"
+					print End
 				} |& sed "s|^|${prefix} |"
 			done < <(printf '%s\n' "${post_install[@]}" | sort)