From 7026a8cfd5cbc413cea9805298fafebf828f1366 Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Sat, 12 Jun 2021 16:49:05 +0200
Subject: [PATCH 1/4] Check home folder before creating multimedia directory

---
 data/helpers.d/multimedia | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/helpers.d/multimedia b/data/helpers.d/multimedia
index 2d43c2540..c86153e85 100644
--- a/data/helpers.d/multimedia
+++ b/data/helpers.d/multimedia
@@ -31,7 +31,10 @@ ynh_multimedia_build_main_dir() {
         mkdir -p "$MEDIA_DIRECTORY/$user/eBook"
         ln -sfn "$MEDIA_DIRECTORY/share" "$MEDIA_DIRECTORY/$user/Share"
         # Création du lien symbolique dans le home de l'utilisateur.
-        ln -sfn "$MEDIA_DIRECTORY/$user" "/home/$user/Multimedia"
+        #link will only be created if the home directory of the user exists and if it's located in '/home' folder
+        if [[ -d "$(getent passwd $user | cut -d: -f6)" && "$(getent passwd $user | cut -d: -f6 | grep home)" ]]; then
+            ln -sfn "$MEDIA_DIRECTORY/$user" "/home/$user/Multimedia"
+        fi
         # Propriétaires des dossiers utilisateurs.
         chown -R $user "$MEDIA_DIRECTORY/$user"
     done

From 9c23f4390550a1c0161880ee0d9bbad6d62a6e90 Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Mon, 14 Jun 2021 23:28:31 +0200
Subject: [PATCH 2/4] check if home exists

---
 data/helpers.d/multimedia                  | 5 +++--
 data/hooks/post_user_create/ynh_multimedia | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/data/helpers.d/multimedia b/data/helpers.d/multimedia
index c86153e85..a07f5fdfd 100644
--- a/data/helpers.d/multimedia
+++ b/data/helpers.d/multimedia
@@ -32,8 +32,9 @@ ynh_multimedia_build_main_dir() {
         ln -sfn "$MEDIA_DIRECTORY/share" "$MEDIA_DIRECTORY/$user/Share"
         # Création du lien symbolique dans le home de l'utilisateur.
         #link will only be created if the home directory of the user exists and if it's located in '/home' folder
-        if [[ -d "$(getent passwd $user | cut -d: -f6)" && "$(getent passwd $user | cut -d: -f6 | grep home)" ]]; then
-            ln -sfn "$MEDIA_DIRECTORY/$user" "/home/$user/Multimedia"
+        home="$(getent passwd $user | cut -d: -f6)"
+        if [[ -d "$home" && "$(echo "$home" | grep home)" ]]; then
+            ln -sfn "$MEDIA_DIRECTORY/$user" "$home/Multimedia"
         fi
         # Propriétaires des dossiers utilisateurs.
         chown -R $user "$MEDIA_DIRECTORY/$user"
diff --git a/data/hooks/post_user_create/ynh_multimedia b/data/hooks/post_user_create/ynh_multimedia
index 441212bbc..aa5ab48d3 100644
--- a/data/hooks/post_user_create/ynh_multimedia
+++ b/data/hooks/post_user_create/ynh_multimedia
@@ -15,7 +15,11 @@ mkdir -p "$MEDIA_DIRECTORY/$user/Video"
 mkdir -p "$MEDIA_DIRECTORY/$user/eBook"
 ln -sfn "$MEDIA_DIRECTORY/share" "$MEDIA_DIRECTORY/$user/Share"
 # Création du lien symbolique dans le home de l'utilisateur.
-ln -sfn "$MEDIA_DIRECTORY/$user" "/home/$user/Multimedia"
+#link will only be created if the home directory of the user exists and if it's located in '/home' folder
+home="$(getent passwd $user | cut -d: -f6)"
+if [[ -d "$home" && "$(echo "$home" | grep home)" ]]; then
+    ln -sfn "$MEDIA_DIRECTORY/$user" "$home/Multimedia"
+fi
 # Propriétaires des dossiers utilisateurs.
 chown -R $user "$MEDIA_DIRECTORY/$user"
 

From 29db3d51fff28e1c9bf1a2e129e1fcb1353d2c5b Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Mon, 14 Jun 2021 23:37:30 +0200
Subject: [PATCH 3/4] grep full /home/

---
 data/helpers.d/multimedia                  | 2 +-
 data/hooks/post_user_create/ynh_multimedia | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/helpers.d/multimedia b/data/helpers.d/multimedia
index a07f5fdfd..4ec7611fc 100644
--- a/data/helpers.d/multimedia
+++ b/data/helpers.d/multimedia
@@ -33,7 +33,7 @@ ynh_multimedia_build_main_dir() {
         # Création du lien symbolique dans le home de l'utilisateur.
         #link will only be created if the home directory of the user exists and if it's located in '/home' folder
         home="$(getent passwd $user | cut -d: -f6)"
-        if [[ -d "$home" && "$(echo "$home" | grep home)" ]]; then
+        if [[ -d "$home" && "$(echo "$home" | grep /home/)" ]]; then
             ln -sfn "$MEDIA_DIRECTORY/$user" "$home/Multimedia"
         fi
         # Propriétaires des dossiers utilisateurs.
diff --git a/data/hooks/post_user_create/ynh_multimedia b/data/hooks/post_user_create/ynh_multimedia
index aa5ab48d3..2fa02505a 100644
--- a/data/hooks/post_user_create/ynh_multimedia
+++ b/data/hooks/post_user_create/ynh_multimedia
@@ -17,7 +17,7 @@ ln -sfn "$MEDIA_DIRECTORY/share" "$MEDIA_DIRECTORY/$user/Share"
 # Création du lien symbolique dans le home de l'utilisateur.
 #link will only be created if the home directory of the user exists and if it's located in '/home' folder
 home="$(getent passwd $user | cut -d: -f6)"
-if [[ -d "$home" && "$(echo "$home" | grep home)" ]]; then
+if [[ -d "$home" && "$(echo "$home" | grep /home/)" ]]; then
     ln -sfn "$MEDIA_DIRECTORY/$user" "$home/Multimedia"
 fi
 # Propriétaires des dossiers utilisateurs.

From 4b84922315e9e89e4d92420d6c8bb95d20b4749c Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 18 Aug 2021 19:47:46 +0200
Subject: [PATCH 4/4] Apply suggestions from code review

---
 data/helpers.d/multimedia                  | 6 +++---
 data/hooks/post_user_create/ynh_multimedia | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/helpers.d/multimedia b/data/helpers.d/multimedia
index 4ec7611fc..552b8c984 100644
--- a/data/helpers.d/multimedia
+++ b/data/helpers.d/multimedia
@@ -32,9 +32,9 @@ ynh_multimedia_build_main_dir() {
         ln -sfn "$MEDIA_DIRECTORY/share" "$MEDIA_DIRECTORY/$user/Share"
         # Création du lien symbolique dans le home de l'utilisateur.
         #link will only be created if the home directory of the user exists and if it's located in '/home' folder
-        home="$(getent passwd $user | cut -d: -f6)"
-        if [[ -d "$home" && "$(echo "$home" | grep /home/)" ]]; then
-            ln -sfn "$MEDIA_DIRECTORY/$user" "$home/Multimedia"
+        local user_home="$(getent passwd $user | cut -d: -f6 | grep '^/home/')"
+        if [[ -d "$user_home" ]]; then
+            ln -sfn "$MEDIA_DIRECTORY/$user" "$user_home/Multimedia"
         fi
         # Propriétaires des dossiers utilisateurs.
         chown -R $user "$MEDIA_DIRECTORY/$user"
diff --git a/data/hooks/post_user_create/ynh_multimedia b/data/hooks/post_user_create/ynh_multimedia
index 2fa02505a..2be3f42d4 100644
--- a/data/hooks/post_user_create/ynh_multimedia
+++ b/data/hooks/post_user_create/ynh_multimedia
@@ -16,9 +16,9 @@ mkdir -p "$MEDIA_DIRECTORY/$user/eBook"
 ln -sfn "$MEDIA_DIRECTORY/share" "$MEDIA_DIRECTORY/$user/Share"
 # Création du lien symbolique dans le home de l'utilisateur.
 #link will only be created if the home directory of the user exists and if it's located in '/home' folder
-home="$(getent passwd $user | cut -d: -f6)"
-if [[ -d "$home" && "$(echo "$home" | grep /home/)" ]]; then
-    ln -sfn "$MEDIA_DIRECTORY/$user" "$home/Multimedia"
+local user_home="$(getent passwd $user | cut -d: -f6 | grep '^/home/')"
+if [[ -d "$user_home" ]]; then
+    ln -sfn "$MEDIA_DIRECTORY/$user" "$user_home/Multimedia"
 fi
 # Propriétaires des dossiers utilisateurs.
 chown -R $user "$MEDIA_DIRECTORY/$user"