From 12a6ec673f57b4adf875b2979718a6234288ab91 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 15 Oct 2013 02:26:39 +0300 Subject: [PATCH] fix for admin user check --- install/vst-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/vst-install.sh b/install/vst-install.sh index 2d4112306..7123f759b 100644 --- a/install/vst-install.sh +++ b/install/vst-install.sh @@ -10,7 +10,7 @@ if [ "x$(id -u)" != 'x0' ]; then fi # Check admin user account -if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then +if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ -z "$1" ]; then echo "Error: user admin exists" echo echo 'Please remove admin user account before proceeding.' @@ -20,8 +20,8 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then fi # Check admin user account -if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then - echo "Error: user admin exists" +if [ ! -z "$(grep ^admin: /etc/group)" ] && [ -z "$1" ]; then + echo "Error: group admin exists" echo echo 'Please remove admin user account before proceeding.' echo 'If you want to do it automatically run installer with -f option:'