From 3c5b26ff79a34a5824d218144a0cdf15483f4bb4 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Oct 09 2022 13:20:41 +0000
Subject: Fix indentation in %sysusers_create_compat macro (rhbz#2132835)


Automatic unindentation after <<-EOF only works with tabs. Jesus.

---

diff --git a/sysusers.generate-pre.sh b/sysusers.generate-pre.sh
index 829d11e..862cb77 100755
--- a/sysusers.generate-pre.sh
+++ b/sysusers.generate-pre.sh
@@ -1,92 +1,93 @@
 #!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: true; tab-width: 4; -*-
 
 # This script turns sysuser.d files into scriptlets mandated by Fedora
 # packaging guidelines. The general idea is to define users using the
 # declarative syntax but to turn this into traditional scriptlets.
 
 user() {
-    user="$1"
-    uid="$2"
-    desc="$3"
-    group="$4"
-    home="$5"
-    shell="$6"
+	user="$1"
+	uid="$2"
+	desc="$3"
+	group="$4"
+	home="$5"
+	shell="$6"
 
-    [ "$desc" = '-' ] && desc=
-    { [ "$home" = '-' ] || [ "$home" = '' ]; } && home=/
-    { [ "$shell" = '-' ] || [ "$shell" = '' ]; } && shell=/usr/sbin/nologin
+	[ "$desc" = '-' ] && desc=
+	{ [ "$home" = '-' ] || [ "$home" = '' ]; } && home=/
+	{ [ "$shell" = '-' ] || [ "$shell" = '' ]; } && shell=/usr/sbin/nologin
 
-    if [ "$uid" = '-' ] || [ "$uid" = '' ]; then
-        cat <<EOF
-getent passwd '$user' >/dev/null || \\
-    useradd -r -g '$group' -d '$home' -s '$shell' -c '$desc' '$user' || :
-EOF
-    else
-        cat <<EOF
-if ! getent passwd '$user' >/dev/null; then
-    if ! getent passwd '$uid' >/dev/null; then
-        useradd -r -u '$uid' -g '$group' -d '$home' -s '$shell' -c '$desc' '$user' || :
-    else
-        useradd -r -g '$group' -d '$home' -s '$shell' -c '$desc' '$user' || :
-    fi
-fi
+	if [ "$uid" = '-' ] || [ "$uid" = '' ]; then
+		cat <<-EOF
+		getent passwd '$user' >/dev/null || \\
+			useradd -r -g '$group' -d '$home' -s '$shell' -c '$desc' '$user' || :
+		EOF
+	else
+		cat <<-EOF
+		if ! getent passwd '$user' >/dev/null; then
+			if ! getent passwd '$uid' >/dev/null; then
+			useradd -r -u '$uid' -g '$group' -d '$home' -s '$shell' -c '$desc' '$user' || :
+			else
+			useradd -r -g '$group' -d '$home' -s '$shell' -c '$desc' '$user' || :
+			fi
+		fi
 
-EOF
-    fi
+		EOF
+	fi
 }
 
 group() {
-    group="$1"
-    gid="$2"
+	group="$1"
+	gid="$2"
 
-    if [ "$gid" = '-' ]; then
-        cat <<-EOF
-	getent group '$group' >/dev/null || groupadd -r '$group' || :
-	EOF
-    else
-        cat <<-EOF
-	getent group '$group' >/dev/null || groupadd -f -g '$gid' -r '$group' || :
-	EOF
-    fi
+	if [ "$gid" = '-' ]; then
+		cat <<-EOF
+		getent group '$group' >/dev/null || groupadd -r '$group' || :
+		EOF
+	else
+		cat <<-EOF
+		getent group '$group' >/dev/null || groupadd -f -g '$gid' -r '$group' || :
+		EOF
+	fi
 }
 
 usermod() {
-    user="$1"
-    group="$2"
+	user="$1"
+	group="$2"
 
-    cat <<-EOF
-if getent group '$group' >/dev/null; then
-    usermod -a -G '$group' '$user' || :
-fi
-    EOF
+	cat <<-EOF
+	if getent group '$group' >/dev/null; then
+		usermod -a -G '$group' '$user' || :
+	fi
+	EOF
 }
 
 parse() {
-    while read -r line || [ -n "$line" ] ; do
-        { [ "${line:0:1}" = '#' ] || [ "${line:0:1}" = ';' ]; } && continue
-        line="${line## *}"
-        [ -z "$line" ] && continue
-        eval "arr=( $line )"
-        case "${arr[0]}" in
-            ('u')
-                group "${arr[1]}" "${arr[2]}"
-                user "${arr[1]}" "${arr[2]}" "${arr[3]}" "${arr[1]}" "${arr[4]}" "${arr[5]}"
-                # TODO: user:group support
-                ;;
-            ('g')
-                group "${arr[1]}" "${arr[2]}"
-                ;;
-            ('m')
-                group "${arr[2]}" "-"
-                user "${arr[1]}" "-" "" "${arr[1]}" "" ""
-                usermod "${arr[1]}" "${arr[2]}"
-                ;;
-        esac
-    done
+	while read -r line || [ -n "$line" ] ; do
+		{ [ "${line:0:1}" = '#' ] || [ "${line:0:1}" = ';' ]; } && continue
+		line="${line## *}"
+		[ -z "$line" ] && continue
+		eval "arr=( $line )"
+		case "${arr[0]}" in
+			('u')
+				group "${arr[1]}" "${arr[2]}"
+				user "${arr[1]}" "${arr[2]}" "${arr[3]}" "${arr[1]}" "${arr[4]}" "${arr[5]}"
+				# TODO: user:group support
+				;;
+			('g')
+				group "${arr[1]}" "${arr[2]}"
+				;;
+			('m')
+				group "${arr[2]}" "-"
+				user "${arr[1]}" "-" "" "${arr[1]}" "" ""
+				usermod "${arr[1]}" "${arr[2]}"
+				;;
+		esac
+	done
 }
 
 for fn in "$@"; do
-    [ -e "$fn" ] || continue
-    echo "# generated from $(basename "$fn")"
-    parse <"$fn"
+	[ -e "$fn" ] || continue
+	echo "# generated from $(basename "$fn")"
+	parse <"$fn"
 done