From 350161974fefcba0829c9d617065486c43b4e1e8 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 10 Jan 2024 10:00:07 +0900
Subject: [PATCH] dev: re-run update.sh if the script itself is modified by the
 update

---
 neko/update/main.sh | 69 +++++++++++++++++++++++++++++++++++++++
 update.sh           | 78 +++------------------------------------------
 2 files changed, 74 insertions(+), 73 deletions(-)
 create mode 100755 neko/update/main.sh

diff --git a/neko/update/main.sh b/neko/update/main.sh
new file mode 100755
index 000000000..f2244d645
--- /dev/null
+++ b/neko/update/main.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+set -eu
+
+. neko/update/utils
+
+# Show messages
+for message in $(find neko/messages -type f ! -name '*.resolved' -print | sort); do
+  file=$(basename -- "${message}")
+
+  if [ ! -f "neko/flags/${file}" ]; then
+    if contains '--install' "$@"; then
+      touch "neko/flags/${file}"
+    else
+      say 'There is an important notice!'
+      cat "${message}"
+
+      say 'Continue? (Are you ready for upgrading?)'
+      printf '[y/N] > '
+      read -r yn
+
+      case "${yn}" in
+        [Yy]|[Yy][Ee][Ss])
+          touch "neko/flags/${file}"
+          say "Let's go!"
+          say "To read the message again, run: \$ cat ${message}"
+          br
+          ;;
+        *)
+          say "Okay, please run this script again when you're ready!"
+          exit 1
+          ;;
+      esac
+    fi
+  fi
+done
+
+# Update
+docker_update() {
+  ./neko/update/container.sh 'docker' "$@"
+}
+podman_update() {
+  ./neko/update/container.sh 'podman' "$@"
+}
+native_update() {
+  ./neko/update/native.sh "$@"
+}
+
+if   contains '--docker' "$@"; then docker_update "$@"
+elif contains '--podman' "$@"; then podman_update "$@"
+elif contains '--native' "$@"; then native_update "$@"
+
+else
+  say 'Do you use Docker or Podman?'
+  printf 'd: Docker, p: Podman, n: No [d/p/N] > '
+  read -r resp
+
+  case "${resp}" in
+    [Yy]|[Yy][Ee][Ss])
+      sadsay "Watch out! ${resp} is not a valid answer." >&2
+      exit 2
+      ;;
+    [Dd]) docker_update "$@" ;;
+    [Pp]) podman_update "$@" ;;
+    *)    native_update "$@" ;;
+  esac
+fi
+
+# Done
+say 'Enjoy your sabakan life~'
diff --git a/update.sh b/update.sh
index d02aa1bd6..da67fc880 100755
--- a/update.sh
+++ b/update.sh
@@ -4,14 +4,12 @@ set -eu
 . neko/update/utils
 
 say 'Start upgrading Firefish!'
-br
 
 # Apply patches
 run './neko/update/patch.sh'
 br
 
 # Pull changes
-## git pull
 OLD_COMMIT=$(git rev-parse --short HEAD)
 
 say 'Pulling changes from the remote repo...'
@@ -27,77 +25,11 @@ fi
 say 'Pulled successfully!'
 br
 
-## check if the update script itself is updated
-say 'Checking if the update script itself has been modified by this update...'
-if [ "$(git diff "${OLD_COMMIT}" "${NEW_COMMIT}" update.sh neko/update)" != '' ]; then
-  say 'Oh meow, that seems to be the case.'
-  sadsay "I'm sorry to bother you, but please run this script again!"
-  exit 1
-else
-  say 'This script seems to be up-to-date!'
+# Check if the update script itself is modified
+if [ "$(git diff "${OLD_COMMIT}" "${NEW_COMMIT}" update.sh)" != '' ]; then
+  say 'This script itself has been modified by the update. Reloading...'
   br
-fi
-
-## show messages
-for message in $(find neko/messages -type f ! -name '*.resolved' -print | sort); do
-  file=$(basename -- "${message}")
-
-  if [ ! -f "neko/flags/${file}" ]; then
-    if contains '--install' "$@"; then
-      touch "neko/flags/${file}"
-    else
-      say 'There is an important notice!'
-      cat "${message}"
-
-      say 'Continue? (Are you ready for upgrading?)'
-      printf '[y/N] > '
-      read -r yn
-
-      case "${yn}" in
-        [Yy]|[Yy][Ee][Ss])
-          touch "neko/flags/${file}"
-          say "Let's go!"
-          say "To read the message again, run: \$ cat ${message}"
-          br
-          ;;
-        *)
-          say "Okay, please run this script again when you're ready!"
-          exit 1
-          ;;
-      esac
-    fi
-  fi
-done
-
-docker_update() {
-  ./neko/update/container.sh 'docker' "$@"
-}
-podman_update() {
-  ./neko/update/container.sh 'podman' "$@"
-}
-native_update() {
-  ./neko/update/native.sh "$@"
-}
-
-if   contains '--docker' "$@"; then docker_update "$@"
-elif contains '--podman' "$@"; then podman_update "$@"
-elif contains '--native' "$@"; then native_update "$@"
-
+  exec "$0" "$@"
 else
-  say 'Do you use Docker or Podman?'
-  printf 'd: Docker, p: Podman, n: No [d/p/N] > '
-  read -r resp
-
-  case "${resp}" in
-    [Yy]|[Yy][Ee][Ss])
-      sadsay "Watch out! ${resp} is not a valid answer." >&2
-      exit 2
-      ;;
-    [Dd]) docker_update "$@" ;;
-    [Pp]) podman_update "$@" ;;
-    *)    native_update "$@" ;;
-  esac
+  ./neko/update/main.sh "$@"
 fi
-
-# Done
-say 'Enjoy your sabakan life~'