From e50af4b463a3abc2a1b3f2c061c705911e2311e6 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 30 Jul 2021 20:15:04 +0200
Subject: [PATCH] less warnings

---
 scripts/install | 14 +++++++-------
 scripts/restore |  7 ++++++-
 scripts/upgrade | 15 ++++++++++-----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/scripts/install b/scripts/install
index 2a3eb6a..71b5141 100755
--- a/scripts/install
+++ b/scripts/install
@@ -78,10 +78,10 @@ ynh_app_setting_set --app=$app --key=port_iframely --value=$port_iframely
 #=================================================
 ynh_script_progression --message="Installing dependencies..."
 
-ynh_install_app_dependencies $pkg_dependencies $pkg_build_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $pkg_build_dependencies
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 ynh_use_nodejs
-ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
+ln -fs /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
 
 #=================================================
 # CREATE DEDICATED USER
@@ -169,10 +169,10 @@ ynh_secure_remove --file="$final_path/build-lemmy-ui"
 
 # Install ImageMagick
 pushd "$final_path/build-imagemagick/"
-	./configure --with-modules
-	make
-	make install
-	ldconfig /usr/local/lib
+	ynh_exec_warn_less ./configure --with-modules
+	ynh_exec_warn_less make
+	ynh_exec_warn_less make install
+	ynh_exec_warn_less ldconfig /usr/local/lib
 popd
 ynh_secure_remove --file="$final_path/build-imagemagick"
 
@@ -201,7 +201,7 @@ mkdir -p "$final_path/iframely/"
 rsync -a "$final_path/build-iframely/output/iframely/" "$final_path/iframely/"
 ynh_secure_remove --file="$final_path/build-iframely"
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:$app "$final_path"
diff --git a/scripts/restore b/scripts/restore
index d0ba091..9bb22a0 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -94,9 +94,10 @@ chown -R $app:$app "$datadir"
 ynh_script_progression --message="Reinstalling dependencies..."
 
 # Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 ynh_use_nodejs
+ln -fs /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
 
 #=================================================
 # BUILDING IMAGEMAGICK
@@ -105,6 +106,8 @@ ynh_script_progression --message="Building ImageMagick..."
 
 ynh_setup_source --dest_dir="$final_path/build-imagemagick/" --source_id="imagemagick"
 
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $imagemagick_build_dependencies
+
 # Install ImageMagick
 pushd "$final_path/build-imagemagick/"
 	./configure --with-modules
@@ -114,6 +117,8 @@ pushd "$final_path/build-imagemagick/"
 popd
 ynh_secure_remove --file="$final_path/build-imagemagick"
 
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 3017d1e..a6aae14 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -131,9 +131,10 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..."
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 ynh_use_nodejs
+ln -fs /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -144,6 +145,8 @@ ynh_script_progression --message="Making upgrade..."
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
+	ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $pkg_build_dependencies
+
 	# Install lemmy
 	pushd $final_path/build-lemmy
 		./docker-image-extract dessalines/lemmy:$LEMMY_VERSION
@@ -162,10 +165,10 @@ then
 
 	# Install ImageMagick
 	pushd "$final_path/build-imagemagick/"
-		./configure --with-modules
-		make
-		make install
-		ldconfig /usr/local/lib
+		ynh_exec_warn_less ./configure --with-modules
+		ynh_exec_warn_less make
+		ynh_exec_warn_less make install
+		ynh_exec_warn_less ldconfig /usr/local/lib
 	popd
 	ynh_secure_remove --file="$final_path/build-imagemagick"
 
@@ -193,6 +196,8 @@ then
 	mkdir -p "$final_path/iframely/"
 	rsync -a "$final_path/build-iframely/output/iframely/" "$final_path/iframely/"
 	ynh_secure_remove --file="$final_path/build-iframely"
+
+	ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 fi
 
 chmod 750 "$final_path"