Clarify "user admin exists" message

This commit is contained in:
Leonid Suprun 2015-01-26 12:32:37 +03:00
commit c1195d1f30
4 changed files with 11 additions and 11 deletions

View file

@ -126,11 +126,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then
exit 1 exit 1
fi fi
# Check admin user account # Check admin group
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then
echo "Error: user admin exists" echo "Error: group admin exists"
echo echo
echo 'Please remove admin user account before proceeding.' echo 'Please remove admin group before proceeding.'
echo 'If you want to do it automatically run installer with -f option:' echo 'If you want to do it automatically run installer with -f option:'
echo "Example: bash $0 --force" echo "Example: bash $0 --force"
exit 1 exit 1

View file

@ -124,11 +124,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then
exit 1 exit 1
fi fi
# Check admin user account # Check admin group
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then
echo "Error: user admin exists" echo "Error: group admin exists"
echo echo
echo 'Please remove admin user account before proceeding.' echo 'Please remove admin group before proceeding.'
echo 'If you want to do it automatically run installer with -f option:' echo 'If you want to do it automatically run installer with -f option:'
echo "Example: bash $0 --force" echo "Example: bash $0 --force"
exit 1 exit 1

View file

@ -123,11 +123,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then
exit 1 exit 1
fi fi
# Check admin user account # Check admin group
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then
echo "Error: user admin exists" echo "Error: group admin exists"
echo echo
echo 'Please remove admin user account before proceeding.' echo 'Please remove admin group before proceeding.'
echo 'If you want to do it automatically run installer with -f option:' echo 'If you want to do it automatically run installer with -f option:'
echo "Example: bash $0 --force" echo "Example: bash $0 --force"
exit 1 exit 1

View file

@ -27,11 +27,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ -z "$1" ]; then
exit 1 exit 1
fi fi
# Check admin user account # Check admin group
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ -z "$1" ]; then if [ ! -z "$(grep ^admin: /etc/group)" ] && [ -z "$1" ]; then
echo "Error: group admin exists" echo "Error: group admin exists"
echo echo
echo 'Please remove admin user account before proceeding.' echo 'Please remove admin group before proceeding.'
echo 'If you want to do it automatically run installer with -f option:' echo 'If you want to do it automatically run installer with -f option:'
echo "Example: bash $0 --force" echo "Example: bash $0 --force"
exit 1 exit 1