|
@@ -112,11 +112,11 @@ setup-vbuilder(){
|
|
|
## check $SUDO_USER and $USERHELPER_UID
|
|
|
RPM_SIGN_USER=$SUDO_USER
|
|
|
if [ -z "${RPM_SIGN_USER}" ]; then
|
|
|
- RPM_SIGN_USER=$(getent passwd $USERHELPER_UID | cut -d":" -f1)
|
|
|
- if [ -z "${RPM_SIGN_USER}" ]; then
|
|
|
- echo $"W: \$SUDO_USER and \$USERHELPER_UID are empty"
|
|
|
+ [ -z "${USERHELPER_UID}" ] && \
|
|
|
+ echo $"W: \$SUDO_USER and \$USERHELPER_UID are empty" && \
|
|
|
return 1
|
|
|
- fi
|
|
|
+
|
|
|
+ RPM_SIGN_USER=$(getent passwd $USERHELPER_UID | cut -d":" -f1)
|
|
|
fi
|
|
|
## get $RPM_SIGN_USER's home directory
|
|
|
HOME=$(getent passwd $RPM_SIGN_USER | cut -d":" -f6)
|