[X2Go-Commits] [x2goserver] 03/27: debian/x2goserver-printing.postinst: Make sure /var/spool/x2goprint is always created.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 31e707f969c4a4c4b5d4fcd926a433310f9608b2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Feb 18 23:04:10 2018 +0100

    debian/x2goserver-printing.postinst: Make sure /var/spool/x2goprint is always created.
---
 debian/changelog                    | 2 ++
 debian/x2goserver-printing.postinst | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7165044..70a5042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   * debian/copyright:
     + Update copyright.in reference template.
   * debian/*: Process with wrap-and-sort -a -s -t -k -b.
+  * debian/x2goserver-printing.postinst:
+    + Make sure /var/spool/x2goprint is always created.
 
   [ Mihai Moldovan ]
   * New upstream version (4.1.0.1):
diff --git a/debian/x2goserver-printing.postinst b/debian/x2goserver-printing.postinst
index 92d8cec..6f72bf9 100755
--- a/debian/x2goserver-printing.postinst
+++ b/debian/x2goserver-printing.postinst
@@ -37,6 +37,9 @@ case "$1" in
 			        --disabled-password --disabled-login \
 			        --shell /bin/sh --group --home /var/spool/x2goprint x2goprint
 		else
+			# make sure the home dir exists...
+			mkdir -p /var/spool/x2goprint/
+
 			echo "User x2goprint already exists." >&2
 			# make sure all settings are appropriate
 			if [ "`id -gn x2goprint`" != "x2goprint" ]; then
@@ -46,9 +49,11 @@ case "$1" in
 				usermod --shell /bin/sh x2goprint
 			fi
 			if [ "`ls -1d ~x2goprint`" != "/var/spool/x2goprint" ]; then
-				test -d /var/spool/x2goprint && \
-					usermod --home /var/spool/x2goprint x2goprint || \
+				if [ -d "/var/spool/x2goprint" ]; then
+					usermod --home /var/spool/x2goprint x2goprint
+				else
 					usermod --move-home --home /var/spool/x2goprint x2goprint
+				fi
 			fi
 			# we leave user shell alone. we have never set this wrongly
 			# and we need to respect the administrator's choices

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git