|
@@ -119,10 +119,8 @@ setup-vbuilder(){
|
|
## check $SUDO_USER and $USERHELPER_UID
|
|
## check $SUDO_USER and $USERHELPER_UID
|
|
RPM_SIGN_USER=$SUDO_USER
|
|
RPM_SIGN_USER=$SUDO_USER
|
|
if [ -z "${RPM_SIGN_USER}" ]; then
|
|
if [ -z "${RPM_SIGN_USER}" ]; then
|
|
- local entries=$(getent passwd $USERHELPER_UID)
|
|
|
|
- if [ $? -eq 0 ]; then
|
|
|
|
- RPM_SIGN_USER=$(echo $entries | cut -d":" -f3)
|
|
|
|
- else
|
|
|
|
|
|
+ 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"
|
|
echo $"W: \$SUDO_USER and \$USERHELPER_UID are empty"
|
|
return 1
|
|
return 1
|
|
fi
|
|
fi
|