From 32417aba34e6ae226b072eea1d3e408ba9fec673 Mon Sep 17 00:00:00 2001 From: Matthias Stecher Date: Sun, 15 Nov 2020 16:34:26 +0100 Subject: [PATCH] __nextcloud: aborts at installation with pgsql/mariadb Accidentally, there was a check for a parameter that could not exist. The block is now streamlined as other parameters got handled, too :-) --- type/__nextcloud/gencode-remote | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/type/__nextcloud/gencode-remote b/type/__nextcloud/gencode-remote index cde78ca..111347c 100755 --- a/type/__nextcloud/gencode-remote +++ b/type/__nextcloud/gencode-remote @@ -122,17 +122,9 @@ if ! grep -q -F "installed = 1" "$__object/explorer/config"; then } # Database setup for mysql and pgsql db_setup() { - if ! [ -f "$__object/parameter/db-host" ]; then - echo "no hostname given! can't proceed." >&2 - exit 3 - fi + # add type and other database values occ_install_args="$occ_install_args --database '$1'" - - db_host="$__object/parameter/database-host" - if [ -f "$db_host" ]; then - occ_install_args="$occ_install_args --database-host '$(cat "$db_host")'" - fi - + occ_install_args="$occ_install_args --database-host '$(cat "$__object/parameter/database-host" || die_err)'" occ_install_args="$occ_install_args --database-name '$(cat "$__object/parameter/database-name" || die_err)'" occ_install_args="$occ_install_args --database-user '$(cat "$__object/parameter/database-user" || die_err)'" occ_install_args="$occ_install_args --database-pass '$(cat "$__object/parameter/database-password" || die_err)'"