Check if Nextcloud is already installed before asking the user if it should be disabled

This commit is contained in:
dkoao 2019-09-27 03:25:56 +00:00
parent 098f24469a
commit fdd6628709
1 changed files with 10 additions and 6 deletions

View File

@ -83,12 +83,6 @@ address, so we're suggesting $DEFAULT_PRIMARY_HOSTNAME.
fi fi
fi fi
# Ask the user if he/she wants to disable Nextcloud
yesno_box "Disable Nextcloud?"\
"Nextcloud offers the Contacts and Calendar features in Mail-in-a-box\
\n\nWould you like to disable it?"\
DISABLE_NEXTCLOUD
# If the machine is behind a NAT, inside a VM, etc., it may not know # If the machine is behind a NAT, inside a VM, etc., it may not know
# its IP address on the public network / the Internet. Ask the Internet # its IP address on the public network / the Internet. Ask the Internet
# and possibly confirm with user. # and possibly confirm with user.
@ -199,6 +193,16 @@ if [ -z "${STORAGE_ROOT:-}" ]; then
STORAGE_ROOT=$([[ -z "${DEFAULT_STORAGE_ROOT:-}" ]] && echo "/home/$STORAGE_USER" || echo "$DEFAULT_STORAGE_ROOT") STORAGE_ROOT=$([[ -z "${DEFAULT_STORAGE_ROOT:-}" ]] && echo "/home/$STORAGE_USER" || echo "$DEFAULT_STORAGE_ROOT")
fi fi
# Check if Nextcloud is already installed
# If it isn't, ask the user if Nextcloud should be disabled
if [ ! -d $STORAGE_ROOT/owncloud ]; then
# Ask the user if he/she wants to disable Nextcloud
yesno_box "Disable Nextcloud?"\
"Nextcloud offers the Contacts and Calendar features in Mail-in-a-box\
\n\nWould you like to disable it?"\
DISABLE_NEXTCLOUD
fi
# Show the configuration, since the user may have not entered it manually. # Show the configuration, since the user may have not entered it manually.
echo echo
echo "Primary Hostname: $PRIMARY_HOSTNAME" echo "Primary Hostname: $PRIMARY_HOSTNAME"