From 6eab89bbe81f7703ca061752642a01fb84280176 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Fri, 3 Feb 2023 16:57:14 +0100
Subject: [PATCH] Update 13.1

---
 conf/app.src    |  4 ++--
 scripts/install | 12 ++++--------
 scripts/restore |  1 -
 scripts/upgrade |  9 +++++----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 034fefb..d332438 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.0.5.tar.gz
-SOURCE_SUM=97A19C8F4E58E3DFB7085A0ACA0D48540A5B39E3FABEC3A623AAD866DE634C74
+SOURCE_URL=https://codeberg.org/calckey/calckey/archive/13.1.tar.gz
+SOURCE_SUM=A7E6F45209AB1E38BB1831427551FA8F04B00121614DB7D550F62F99255ADC33
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/scripts/install b/scripts/install
index 18c864e..4a6b639 100755
--- a/scripts/install
+++ b/scripts/install
@@ -74,8 +74,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
-ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
-
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -134,13 +132,11 @@ ynh_script_progression --message="Building app..." --weight=15
 
 pushd "$final_path"
 	ynh_use_nodejs
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run clean-all
 	corepack enable
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn set version berry
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn plugin import workspace-tools
-	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 yarn run rebuild
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run migrate
+	corepack prepare pnpm@latest --activate
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm i
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run init
 popd
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 50a0ea5..5969136 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -73,7 +73,6 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=5
 # Define and install dependencies
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
 
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 33926a3..63625a5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -120,7 +120,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=5
 
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -137,9 +136,11 @@ ynh_script_progression --message="Building app..."
 
 pushd "$final_path"
     ynh_use_nodejs
-	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 yarn run rebuild
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run migrate
+    corepack enable
+	corepack prepare pnpm@latest --activate
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm install
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm migrate
 popd
 
 #=================================================