From 085d933afc224ece0537be1ae1144408ab3d91a6 Mon Sep 17 00:00:00 2001
From: Andrew Hurley <andrew@cherished.me>
Date: Sun, 30 Oct 2022 16:14:20 +0000
Subject: [PATCH] error checking fixed

---
 nextcloud/install.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/nextcloud/install.sh b/nextcloud/install.sh
index 8afea54..dfc8c10 100755
--- a/nextcloud/install.sh
+++ b/nextcloud/install.sh
@@ -26,23 +26,24 @@ if [[ $? -eq 0 && -n $RE ]]; then
   read -r -s -N 1 -p "Press 'Enter' to continue " ENTER
   if [[ $ENTER != $'\n' ]]; then exit; fi
   printf "\n"
-  printf "Installing Nextcloud...\n"
 
   RE=$($P1 nextc-db bash -c "mysqladmin -u root password $ROOTPASS")
   if [[ $? -eq 0 ]]; then
     printf "Root password changed\n"
     printf "ROOTPASS: $ROOTPASS\n" > install.log
+  else
+    printf "Error trying to change root password\n"
+    exit 1
+  fi
 
-    RE=$($P1 nextc bash -c "$P2 maintenance:install --database mysql \
+  RE=$($P1 nextc bash -c "$P2 maintenance:install --database mysql \
     --database-host nextc-db --database-name ncdb --database-user root \
     --database-pass $ROOTPASS --admin-user $USERNAME --admin-pass $USERPASS --data-dir /ncdata")
-    if [[ $? -eq 0 ]]; then
-      printf "USERNAME: $USERNAME\nUSERPASS: $USERPASS\n" >> install.log
-      printf "Install success\n"
-    else
-      exit 1;
-    fi
+  if [[ $? -eq 0 ]]; then
+    printf "USERNAME: $USERNAME\nUSERPASS: $USERPASS\n" >> install.log
+    printf "Install success\n"
   else
+    printf "Error installing nextcloud\n"
     exit 1;
   fi
 fi