From 7cfd6d2869aa786c9aa40abb02ca2241a8d98204 Mon Sep 17 00:00:00 2001
From: Nikolas Zimmermann <nzimmermann@igalia.com>
Date: Thu, 26 Sep 2024 15:26:10 +0200
Subject: [PATCH] Unbreak .wkdev-init script

1. No more progress messages:

[4/14]
[5/14]
[6/14]
[7/14]
      -> /etc/subgid contents: nzimmermann:50000:50000
      -> /etc/subuid contents: nzimmermann:50000:50000

2. Broken symlink, due to wrong s/log/task_step/ replacement.

sudo: unable to resolve host wkdev.nzimmermann-thinkpad: Name or service not known
ln: failed to create symbolic link '/dev/task_step': Permission denied
[8/14]
[9/14]
[10/14]
[11/14]
[12/14]

3. Missing task_step usage (wrong counter, 14 steps not 13).

[12/13] Setup rust '/opt/rust' directory permissions...

While I was at it:
Swap try_setup_sudoers_task and try_setup_journal_dev_log, to suppress a
sudo warning regarding the hostname on my machine.
---
 scripts/container-only/.wkdev-init | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/container-only/.wkdev-init b/scripts/container-only/.wkdev-init
index 47b3b3b..891b01a 100755
--- a/scripts/container-only/.wkdev-init
+++ b/scripts/container-only/.wkdev-init
@@ -133,8 +133,8 @@ try_setup_setgid_subuid_files() {
 
 try_setup_journal_dev_log() {
 
-    task_step "Set /dev/task_step symbolic link to /run/systemd/journal/dev-task_step ..."
-    sudo ln -sf /run/systemd/journal/dev-task_step /dev/task_step
+    task_step "Set /dev/log symbolic link to /run/systemd/journal/dev-log ..."
+    sudo ln -sf /run/systemd/journal/dev-log /dev/log
 }
 
 try_setup_sudoers_file() {
@@ -190,10 +190,9 @@ try_setup_permissions_jhbuild_directory() {
 
 try_setup_permissions_rust_directory() {
 
-    echo ""
-
     local rust_directory="/opt/rust"
-    echo "[12/13] Setup rust '${rust_directory}' directory permissions..."
+
+    task_step "Setup rust '${rust_directory}' directory permissions..."
 
     chown --recursive "${container_user_name}:${container_group_name}" "${rust_directory}" &>/dev/null
 }
@@ -227,8 +226,8 @@ TASKS=(
     "try_install_additional_packages"
     "try_switch_shell_for_user"
     "try_setup_setgid_subuid_files"
-    "try_setup_journal_dev_log"
     "try_setup_sudoers_file"
+    "try_setup_journal_dev_log"
     "try_setup_run_user_directory"
     "try_setup_dockerenv_file"
     "try_setup_permissions_jhbuild_directory"
@@ -241,7 +240,7 @@ task_step() {
     TASK_TOTAL=${TASK_TOTAL:-${#TASKS[@]}}
 
     echo ""
-    echo -n "[${TASK_STEP}/${TASK_TOTAL}] "
+    echo "[${TASK_STEP}/${TASK_TOTAL}] ${1}"
     TASK_STEP=$(( TASK_STEP + 1 ))
 }