From 6ecce03d3e4b5be36581517f160d5371b4ede978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Thu, 14 Mar 2024 20:44:19 +0100
Subject: [PATCH] Regroup common code, cleanup after build

---
 scripts/_common.sh | 11 +++++++++++
 scripts/install    |  7 +------
 scripts/upgrade    |  8 +-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 0ed53cc..022eb88 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -10,6 +10,17 @@ NODEJS_VERSION="16.15.0"
 # PERSONAL HELPERS
 #=================================================
 
+misskey_build() {
+    pushd "$install_dir"
+        ynh_use_nodejs
+        ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" NODE_ENV=production yarn add ts-node webpack
+        ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" NODE_ENV=production yarn build
+        ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" NODE_ENV=production yarn run init
+    popd
+
+    ynh_secure_remove --file="$install_dir/.cache"
+}
+
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index 2ca1264..cab6d70 100755
--- a/scripts/install
+++ b/scripts/install
@@ -41,12 +41,7 @@ ynh_add_config --template="default.yml" --destination="$install_dir/.config/defa
 #=================================================
 ynh_script_progression --message="Building app..." --weight=15
 
-pushd "$install_dir"
-    ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn add ts-node webpack
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" NODE_ENV=production yarn build
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn run init
-popd
+misskey_build
 
 #=================================================
 # SYSTEM CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 1603011..2dca9ad 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -51,13 +51,7 @@ chown -R "$app:www-data" "$install_dir"
 #=================================================
 ynh_script_progression --message="Building app..."
 
-pushd "$install_dir"
-    ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn cleanall
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn install
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" NODE_ENV=production yarn build
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn migrate
-popd
+misskey_build
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS