From 5bb135967615c37116e0021bb3111c77dc371d73 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 8 Jan 2024 01:46:13 +0300 Subject: [PATCH] testing... Signed-off-by: Alex A. Naanou --- .pct-helpers | 4 ++++ nextcloud/make.sh | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.pct-helpers b/.pct-helpers index e7401f3..27f65b3 100644 --- a/.pct-helpers +++ b/.pct-helpers @@ -292,6 +292,10 @@ buildAssets(){ local ASSETS_DIR=$2 ASSETS_DIR=${ASSETS_DIR:=assets} + if ! [ -e $TEMPLATE_DIR ] ; then + return + fi + local TEMPLATES=($(find "$TEMPLATE_DIR" -type f)) for file in "${TEMPLATES[@]}" ; do file=${file#${TEMPLATE_DIR}} diff --git a/nextcloud/make.sh b/nextcloud/make.sh index 14060cd..3ec663e 100755 --- a/nextcloud/make.sh +++ b/nextcloud/make.sh @@ -92,14 +92,19 @@ sleep ${TIMEOUT:=5} # https://www.turnkeylinux.org/docs/inithooks printf "# TKL setup, this may take a while" -while ! $(lxc-attach $ID -- test -e /etc/inithooks.conf) \ - || ! [[ $(lxc-attach $ID -- cat /etc/inithooks.conf | wc -c) < 2 ]] ; do +while ! $(lxc-attach $ID -- test -e /etc/inithooks.conf) ; do printf '.' - sleep 2 + sleep 5 done -echo +printf '+' +while ! [[ $(lxc-attach $ID -- cat /etc/inithooks.conf | wc -c) < 2 ]] ; do + printf '.' + sleep 5 +done +printf 'ready.\n' +sleep 5 -echo "# Starting TKL Setup (this may take a few minutes to start)..." +echo "# Starting TKL UI..." @ lxc-attach $ID -- bash --login -c 'exit' exit