From 89493a4d39d8783944c2bf2a908699948d614de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 11 Dec 2020 21:10:17 +0100
Subject: [PATCH] Fix linter warning (#9)

---
 manifest.json      |  4 ++++
 scripts/_common.sh |  2 +-
 scripts/install    | 10 ----------
 scripts/upgrade    |  7 -------
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/manifest.json b/manifest.json
index c20309c..e462363 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,6 +50,10 @@
                     "en": "Is it a public application?",
                     "fr": "Est-ce une application publique ?"
                 },
+                "help": {
+                    "en": "If enabled, Lychee will be accessible by people who do not have an account. This can be changed later via the webadmin.",
+                    "fr": "Si cette case est cochée, Lychee sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+                },
                 "default": true
             }
         ]
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 54392f4..0114157 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -65,7 +65,7 @@ ynh_install_composer () {
     install_args="${install_args:-}"
     composerversion="${composerversion:-$YNH_COMPOSER_VERSION}"
 
-    curl -sS https://getcomposer.org/installer \
+    curl -sS https://getcomposer.org/installer 2>&1 \
         | COMPOSER_HOME="$workdir/.composer" \
         php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \
         || ynh_die "Unable to install Composer." 2>&1
diff --git a/scripts/install b/scripts/install
index 477f364..56aa2cf 100755
--- a/scripts/install
+++ b/scripts/install
@@ -85,14 +85,6 @@ mkdir -p ${public_path}/uploads/{big,import,medium,raw,small,thumb}
 # Create a dedicated NGINX config
 ynh_add_nginx_config "public_path"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=2
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config "public_path"
-
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -166,8 +158,6 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=1
 # Make app public if necessary or protect it
 if [ $is_public -eq 1 ]
 then
-	# Everyone can access the app.
-	# The "main" permission is automatically created before the install script.
 	ynh_permission_update --permission "main" --add "visitors"
 fi
 
diff --git a/scripts/upgrade b/scripts/upgrade
index f80ac80..4a11512 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -81,13 +81,6 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=3
-
-ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================