From 9699805c12733351dd476df047a0479a2cff2bc6 Mon Sep 17 00:00:00 2001
From: hael <laci@sse.hu>
Date: Mon, 19 Jun 2023 12:42:28 +0000
Subject: [PATCH] mods

---
 install.sh | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/install.sh b/install.sh
index e40f874..658e2a7 100755
--- a/install.sh
+++ b/install.sh
@@ -496,8 +496,10 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
 		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_PASSWORD=$NEXTCLOUD_PASSWORD";
 
 		if [ ! -d "/etc/user/data/nextcloud" ]; then
-			$SUDO_CMD mkdir -p "/etc/user/data/nextcloud"
-			$SUDO_CMD chown -R 82:82 "/etc/user/data/nextcloud"
+			for DIR in data apps config ; do
+				$SUDO_CMD mkdir -p "/etc/user/data/nextcloud/$DIR"
+				$SUDO_CMD chown -R 82:82 "/etc/user/data/nextcloud/$DIR"
+			done
 		fi;
 	
 		ADDITIONAL_SERVICES="";
@@ -531,19 +533,22 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
 	--volume /etc/user/:/etc/user/ \
 	--volume /etc/system/:/etc/system/ \
 	registry.format.hu/installer-tool
-		
-	if [ "$ADDITIONAL_SERVICE" != "" ]; then 
-		for ADDITIONAL_SERVICE in $(echo $ADDITIONAL_SERVICES); do
-			service-debian $ADDITIONAL_SERVICE start
-			echo "$INIT_SERVICE_PATH/$ADDITIONAL_SERVICE.json" >> $PWD/.init_services
-		done
-	fi
-
-	if [ "$DISCOVERY" != "yes" ] ; then
-		discover_services;
-	fi;
 fi
 
+shopt -s expand_aliases
+source $HOME/.bash_aliases
+
+if [ "$ADDITIONAL_SERVICES" != "" ]; then 
+	for ADDITIONAL_SERVICE in $(echo $ADDITIONAL_SERVICES); do
+		service-debian $ADDITIONAL_SERVICE start
+		echo "$INIT_SERVICE_PATH/$ADDITIONAL_SERVICE.json" >> $PWD/.init_services
+	done
+fi
+
+if [ "$DISCOVERY" != "yes" ] ; then
+	discover_services;
+fi;
+
 if [ "$DISCOVERY" == "yes" ] ; then
 	$SUDO_CMD chmod a+x $DISCOVERY_DIR/service-discovery.sh
 	$DISCOVERY_DIR/service-discovery.sh $DISCOVERY_CONFIG_FILE;