From 107895d59477935045fdb329b69aac5c1e7b39b8 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sun, 3 Nov 2024 22:36:30 +0100 Subject: [PATCH] Rename hooks --- scripts/Common/OS/setup.fish | 4 ++-- scripts/lib/action.fish | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish index bd8ea6b1..1639aa07 100755 --- a/scripts/Common/OS/setup.fish +++ b/scripts/Common/OS/setup.fish @@ -66,14 +66,14 @@ function runSetup cp -r "$nixPkgsDir" "$mountDir/$nixPkgsDir" end - function prepareAction + function actionInitialization echo "Partitioning drives..." and getOSConfig partition.script >"$script" and "$script" and rm "$script" end - function postAction + function actionPostRun echo "Setup finished!" and echo "This machine will reboot in 5 seconds..." and echo "Press CTRL-C to abort..." diff --git a/scripts/lib/action.fish b/scripts/lib/action.fish index 092e9a55..d910301e 100644 --- a/scripts/lib/action.fish +++ b/scripts/lib/action.fish @@ -14,14 +14,14 @@ function runAction -V dir set -x CONFIG_NAME "$config" end - and runHook prepareAction || true + and runHook actionInitialization || true echo "Flagging repository as safe..." sudo git config --system --add safe.directory (realpath "$(status dirname)/../..") - and runHook preAction || true + and runHook actionPreRun || true $argv - and runHook postAction || true + and runHook actionPostRun || true sudo git config remove-section --system safe || true end