From 5f23751479168b7290fbb7fdc7a4a2cb00b9de38 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sun, 29 Apr 2018 17:43:13 +0200
Subject: [PATCH] Update ynh_system_user_create helper to allow creating users
 with login shell

---
 data/helpers.d/user | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/data/helpers.d/user b/data/helpers.d/user
index 47e6eb88a..e59466b33 100644
--- a/data/helpers.d/user
+++ b/data/helpers.d/user
@@ -41,9 +41,10 @@ ynh_system_user_exists() {
 
 # Create a system user
 #
-# usage: ynh_system_user_create user_name [home_dir]
+# usage: ynh_system_user_create user_name [home_dir [use_shell]]
 # | arg: user_name - Name of the system user that will be create
 # | arg: home_dir - Path of the home dir for the user. Usually the final path of the app. If this argument is omitted, the user will be created without home
+# | arg: use_shell - Create a user using the default login shell if present. If this argument is omitted, the user will be created with /usr/sbin/nologin shell
 ynh_system_user_create () {
 	if ! ynh_system_user_exists "$1"	# Check if the user exists on the system
 	then	# If the user doesn't exist
@@ -52,7 +53,12 @@ ynh_system_user_create () {
 		else
 			local user_home_dir="--no-create-home"
 		fi
-		sudo useradd $user_home_dir --system --user-group $1 --shell /usr/sbin/nologin || ynh_die "Unable to create $1 system account"
+		if [ $# -ge 3 ]; then	# If we want a shell for the user
+			local shell="" # Use default shell
+		else
+			local shell="--shell /usr/sbin/nologin"
+		fi
+		useradd $user_home_dir --system --user-group $1 $shell || ynh_die "Unable to create $1 system account"
 	fi
 }