From 832d43d1e7275dc4852a7d2c26fb4e6ec954ac31 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 27 Feb 2019 20:38:31 +0100
Subject: [PATCH] remove ynh_package_install postgresql

---
 scripts/install | 19 ++++++++-----------
 scripts/restore | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/scripts/install b/scripts/install
index 7cd34b1..89b7b88 100644
--- a/scripts/install
+++ b/scripts/install
@@ -93,7 +93,14 @@ ynh_app_setting_set $app port $port
 ynh_print_info "Add nodejs repository..."
 
 curl -sL https://deb.nodesource.com/setup_8.x | sudo bash -
-ynh_package_update
+
+#=================================================
+# ADD ONLYOFFICE REPOSITORY
+#=================================================
+ynh_print_info "Add OnlyOffice repository..."
+
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5
+echo "deb http://download.onlyoffice.com/repo/debian squeeze main" | sudo tee /etc/apt/sources.list.d/onlyoffice.list
 
 #=================================================
 # INSTALL DEPENDENCIES
@@ -123,7 +130,6 @@ ynh_print_info "Creating a PostgreSQL database..."
 ###		- Remove also the section "REMOVE THE POSTGRESQL DATABASE" in the remove script
 ###		- As well as the section "RESTORE THE POSTGRESQL DATABASE" in the restore script
 
-ynh_package_install postgresql
 db_name=$(ynh_sanitize_dbid $app)
 db_pwd="onlyoffice"
 ynh_app_setting_set $app db_name $db_name
@@ -179,15 +185,6 @@ ynh_print_info "Define OnlyOffice server port..."
 
 echo onlyoffice-documentserver onlyoffice/ds-port select ${port} | sudo debconf-set-selections
 
-#=================================================
-# ADD ONLYOFFICE REPOSITORY
-#=================================================
-ynh_print_info "Add OnlyOffice repository..."
-
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5
-echo "deb http://download.onlyoffice.com/repo/debian squeeze main" | sudo tee /etc/apt/sources.list.d/onlyoffice.list
-ynh_package_update
-
 #=================================================
 # INSTALL ONLYOFFICE
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index d6508b3..92ed69a 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -87,7 +87,14 @@ chown -R $app: $final_path
 ynh_print_info "Add nodejs repository..."
 
 curl -sL https://deb.nodesource.com/setup_8.x | sudo bash -
-ynh_package_update
+
+#=================================================
+# ADD ONLYOFFICE REPOSITORY
+#=================================================
+ynh_print_info "Add OnlyOffice repository..."
+
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5
+echo "deb http://download.onlyoffice.com/repo/debian squeeze main" | sudo tee /etc/apt/sources.list.d/onlyoffice.list
 
 #=================================================
 # REINSTALL DEPENDENCIES
@@ -102,7 +109,6 @@ ynh_install_app_dependencies postgresql libstdc++6 redis-server rabbitmq-server
 #=================================================
 ynh_print_info "Restoring the PostgreSQL database..."
 
-ynh_package_install postgresql
 ynh_psql_test_if_first_run
 ynh_psql_create_db $db_name $db_name $db_pwd
 ynh_psql_execute_file_as_root ./db.sql "$db_name"
@@ -114,15 +120,6 @@ ynh_print_info "Define OnlyOffice server port..."
 
 echo onlyoffice-documentserver onlyoffice/ds-port select ${port} | sudo debconf-set-selections
 
-#=================================================
-# ADD ONLYOFFICE REPOSITORY
-#=================================================
-ynh_print_info "Add OnlyOffice repository..."
-
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5
-echo "deb http://download.onlyoffice.com/repo/debian squeeze main" | sudo tee /etc/apt/sources.list.d/onlyoffice.list
-ynh_package_update
-
 #=================================================
 # REINSTALL ONLYOFFICE
 #=================================================