From 773760efe6afbca29de4077a4bfafd8d800d5e82 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Sat, 28 Jan 2023 12:36:20 +0100
Subject: [PATCH] Fix install

---
 scripts/install | 10 ++--------
 scripts/upgrade |  2 --
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/scripts/install b/scripts/install
index 83af1df..e9918ed 100755
--- a/scripts/install
+++ b/scripts/install
@@ -101,6 +101,8 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
+ynh_exec_warn_less git submodule update --init
+
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
@@ -124,14 +126,6 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
 
 ynh_add_config --template="../conf/default.yml" --destination="$final_path/.config/default.yml"
 
-#=================================================
-# ADD GIT SUBMODULE
-#=================================================
-ynh_script_progression --message="Adding submodule update..." --weight=1
-
-cd $final_path 
-git checkout master
-git submodule update --init
 
 #=================================================
 # BUILD APP
diff --git a/scripts/upgrade b/scripts/upgrade
index b19f6bc..708bb31 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -107,7 +107,6 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path" --keep=".config/default.yml"
-        git submodule update --init
 fi
 
 chmod 750 "$final_path"
@@ -121,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