Accepting request 836013 from Base:System

OBS-URL: https://build.opensuse.org/request/show/836013
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysuser-tools?expand=0&rev=11

macros.sysusers

@@ -13,8 +13,7 @@
 #
 ###
 
-# This is for useradd/usermod/groupadd
-%sysusers_requires	Requires(pre): useradd_or_adduser_dep sysuser-shadow /usr/bin/cat \
+%sysusers_requires	Requires(pre): sysuser-shadow \
 Suggests:        shadow
 
 %sysusers_generate_pre()	\

sysuser-tools.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep 18 10:32:53 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Avoid useless use of cat
+- Simplify %sysusers_requires
+- Drop shebang, rpm passes it to /bin/sh itself
+
 -------------------------------------------------------------------
 Fri Aug 21 15:09:13 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 

sysusers-generate-pre

@@ -1,8 +1,6 @@
 #!/bin/sh
 # pass systemd sysusers config paths as argument to this script.
 
-echo '#!/bin/sh'
-echo 'cat <<"EOF" |'
+echo '/usr/sbin/sysusers2shadow <<"EOF" || [ -f /.buildenv ]'
 grep -he '^[ugmr]' "$@"
 echo 'EOF'
-echo '/usr/sbin/sysusers2shadow || [ -f /.buildenv ]'

sysusers2shadow.sh

@@ -13,6 +13,7 @@ for i in /bin/busybox /usr/bin/busybox; do [ -x "$i" ] && busybox=$i; done
 
 while read LINE
 do
+	# "eval set" to do proper splitting while respecting quotes
 	eval set -- $LINE
 	case "${1-}" in
 	\#*|"")