From 044962d62527c15194e4515df5e8620678da1c57 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Wed, 10 Jan 2024 18:12:24 +0300
Subject: [PATCH] refactoring...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 .pct-helpers      | 29 ++++++++++++++++++++++++++---
 nextcloud/make.sh | 13 +++++++------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/.pct-helpers b/.pct-helpers
index 875526b..63d5023 100644
--- a/.pct-helpers
+++ b/.pct-helpers
@@ -216,20 +216,20 @@ xreadpass(){
 
 # Wait for /etc/inithooks.conf to be generated then cleared
 #
-# 	tklWaitForSetup
+# 	tklWaitForSetup ID
 #
 # for tkl inithooks doc see:
 # 	https://www.turnkeylinux.org/docs/inithooks
 tklWaitForSetup(){
 	printf "# TKL setup, this may take a while"
 	if [ -z $DRY_RUN ] ; then
-		while ! $(lxc-attach $ID -- test -e /etc/inithooks.conf) ; do
+		while ! $(lxc-attach $1 -- test -e /etc/inithooks.conf) ; do
 			printf '.'
 			sleep ${TIMEOUT:=5}
 		done
 		printf '+'
 		sleep ${TIMEOUT:=5}
-		while ! [[ $(lxc-attach $ID -- cat /etc/inithooks.conf | wc -c) < 2 ]] ; do
+		while ! [[ $(lxc-attach $1 -- cat /etc/inithooks.conf | wc -c) < 2 ]] ; do
 			printf '.'
 			sleep ${TIMEOUT:=5}
 		done
@@ -483,6 +483,29 @@ pctCreateUbuntu(){
 	@ lxc-attach $1 -- apt upgrade -y
 }
 
+#
+#	pctCreateTurnkey APP ID ARGS [PASS]
+#
+pctCreateTurnkey(){
+	local app=$1
+	shift
+	local TEMPLATE
+	getLatestTemplate '*-turnkey-'$app TEMPLATE
+
+	pctCreate $1 "$TEMPLATE" "$2" "$3"
+
+	tklWaitForSetup $1
+
+	sleep ${TIMEOUT:=5}
+}
+#
+#	pctUpdateTurnkey ID
+#
+pctUpdateTurnkey(){
+	@ lxc-attach $1 apt update
+	@ lxc-attach $1 -- apt upgrade -y
+}
+
 
 #
 #	pctSet ID [ARGS [REBOOT]]
diff --git a/nextcloud/make.sh b/nextcloud/make.sh
index ea43604..54d0e91 100755
--- a/nextcloud/make.sh
+++ b/nextcloud/make.sh
@@ -70,11 +70,13 @@ echo "# Building config..."
 buildAssets
 
 echo "# Creating CT..."
-getLatestTemplate '.*-turnkey-nextcloud' TEMPLATE
-pctCreate $ID "$TEMPLATE" "$OPTS_STAGE_1" "$PASS"
-sleep ${TIMEOUT:=5}
+pctCreateTurnkey 'nextcloud' $ID "$OPTS_STAGE_1" "$PASS"
 
-tklWaitForSetup
+#getLatestTemplate '.*-turnkey-nextcloud' TEMPLATE
+#pctCreate $ID "$TEMPLATE" "$OPTS_STAGE_1" "$PASS"
+#sleep ${TIMEOUT:=5}
+#
+#tklWaitForSetup $ID
 
 echo "# Starting TKL UI..."
 # XXX might be a good idea to reaaad stuff from config...
@@ -109,8 +111,7 @@ echo "# Disabling fail2ban..."
 @ lxc-attach $ID systemctl disable fail2ban
 
 echo "# Updating system..."
-@ lxc-attach $ID apt update 
-@ lxc-attach $ID -- apt upgrade -y
+pctUpdateTurnkey $ID
 
 echo "# Post config..."
 pctSet $ID "${OPTS_STAGE_2}" $REBOOT