From 50dd812b7a96b6dd011a99bd74d3edba9e46d592 Mon Sep 17 00:00:00 2001 From: Joe Cooper Date: Thu, 2 Nov 2017 16:53:45 -0500 Subject: [PATCH] Correctly detect UID if lang isn't en_US --- virtualmin-install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/virtualmin-install.sh b/virtualmin-install.sh index 38ce4f5..4de400e 100644 --- a/virtualmin-install.sh +++ b/virtualmin-install.sh @@ -54,7 +54,7 @@ usage () { printf " ${YELLOW}--setup|-s${NORMAL} - Setup software repositories and exit (no installation or configuration)\n" printf " ${YELLOW}--minimal|-m${NORMAL} - Install a smaller subset of packages for low-memory/low-resource systems\n" printf " ${YELLOW}--bundle|-b ${NORMAL} - Choose bundle to install (LAMP or LEMP, defaults to LAMP)\n" - #printf " ${YELLOW}--disable ${NORMAL} - Disable feature [SCL|EPEL|PG]\n" + printf " ${YELLOW}--disable ${NORMAL} - Disable feature [SCL]\n" echo } @@ -549,7 +549,7 @@ download() { } # Only root can run this -id | grep "uid=0(" >/dev/null +id | grep -i "uid=0(" >/dev/null if [ "$?" != "0" ]; then uname -a | grep -i CYGWIN >/dev/null if [ "$?" != "0" ]; then @@ -923,9 +923,10 @@ if [ ! -z "$QUOTA_FAILED" ]; then fi echo if [ $errors -eq "0" ]; then + hostname=$(hostname -f) log_success "Installation Complete!" log_success "If there were no errors above, Virtualmin should be ready" - log_success "to configure at https://$name:10000." + log_success "to configure at https://$hostname:10000." else log_warning "The following errors occurred during installation:" echo