From dfcbfb8451f35c43dfbbf5ca88e920df41dd13ab Mon Sep 17 00:00:00 2001
From: laci <root@DESKTOP-6AP4J8U>
Date: Tue, 2 Jul 2024 12:37:09 +0200
Subject: [PATCH] docker

---
 index.html  |  2 +-
 install.php |  7 +++++++
 install.sh  | 20 +++++++++++---------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index 37ee157..9c0f196 100644
--- a/index.html
+++ b/index.html
@@ -145,7 +145,7 @@
 		</select>
     </div>
 </div>
-<div id="div_additionals">
+<div id="div_additionals" class="hidden">
 	<div class="row">
 	    <div class="mb-3">
 			<label for="service_dir">Please add directory path of service files: (/etc/user/config/services/)</label>
diff --git a/install.php b/install.php
index 9adb53f..4fc36b0 100644
--- a/install.php
+++ b/install.php
@@ -2,6 +2,10 @@
 
 putenv('WEBINSTALL=true');
 
+// TEMP
+putenv('HOME=/home/hael');
+putenv('USER=hael');
+
 putenv('DOCKER_REGISTRY_URL='.$_POST["registry"]);
 
 if ($_POST["smarthost"]=="Y") {
@@ -44,6 +48,9 @@ putenv('ADDITIONAL='.$_POST["additional"]);
 
 // check ENV variables
 $output = shell_exec("set");
+echo "<pre>".$output."</pre>";
+
+$output = shell_exec("sh install.sh");
 echo $output;
 
 ?>
diff --git a/install.sh b/install.sh
index 040849d..9808e0b 100755
--- a/install.sh
+++ b/install.sh
@@ -647,15 +647,17 @@ else
 	ACTION="install";
 fi;
 
-if [ "$USER" != "root" ] ; then
-	echo "You are not logged in as root."
-	echo "Do you want to continue and run $ACTION script as "$USER" user using sudo? (Y/n)";
-	read -r ANSWER;
-	if [ "$ANSWER" == "n" ] || [ "$ANSWER" == "N" ]; then
-		echo "Bye."
-		exit;
-	else
-		SUDO_CMD="sudo ";
+if [ "$WEBINSTALL" == "" ]; then
+	if [ "$USER" != "root" ] ; then
+		echo "You are not logged in as root."
+		echo "Do you want to continue and run $ACTION script as "$USER" user using sudo? (Y/n)";
+		read -r ANSWER;
+		if [ "$ANSWER" == "n" ] || [ "$ANSWER" == "N" ]; then
+			echo "Bye."
+			exit;
+		else
+			SUDO_CMD="sudo ";
+		fi;
 	fi;
 fi;