From 8c408e6c5b5568ff5f11e4e27eaa2ce68beb0c53 Mon Sep 17 00:00:00 2001
From: SansGuidon <sansguidon@noreply.gitea.zoemp.be>
Date: Mon, 28 Apr 2025 11:19:22 +0000
Subject: [PATCH] fix(cloudron) configure yt-dlp interactive bashing

---
 cloudron/awesome-installs/yt-dlp.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/cloudron/awesome-installs/yt-dlp.sh b/cloudron/awesome-installs/yt-dlp.sh
index f2881e8..f4c4314 100644
--- a/cloudron/awesome-installs/yt-dlp.sh
+++ b/cloudron/awesome-installs/yt-dlp.sh
@@ -1,18 +1,25 @@
 #!/bin/bash
-set -euo pipefail
+set -eo pipefail
 
 read -rsp "Set password for admin (HTTP Basic Auth): " pass1; echo
 read -rsp "Confirm password: " pass2; echo
+if [ -z "${pass1:-}" ] || [ -z "${pass2:-}" ]; then
+  echo "Password not set. Aborting."
+  exit 1
+fi
 [ "$pass1" != "$pass2" ] && echo "Passwords do not match." && exit 1
 
 read -rp "Enter downloads directory [/app/data/downloads]: " downloads_dir
 downloads_dir=${downloads_dir:-/app/data/downloads}
 
+set -euo pipefail
+
 mkdir -p /app/data/public/bin "$downloads_dir"
 /bin/rm -f /app/data/public/bin/yt-dlp
 curl -sSL https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /app/data/public/bin/yt-dlp
 chmod +x /app/data/public/bin/yt-dlp
 
+# .htaccess basic auth
 if command -v htpasswd >/dev/null 2>&1; then
   htpasswd -cb /app/data/.htpasswd admin "$pass1"
 else
@@ -26,13 +33,13 @@ AuthUserFile /app/data/.htpasswd
 Require valid-user
 EOF
 
-set +u
+# Config
 {
   echo "[settings]"
   echo "downloads_dir=$downloads_dir"
 } > /app/data/config.ini
-set -u
 
+# PHP Front
 cat > /app/data/public/index.php <<'EOF'
 <?php
 $config = parse_ini_file("/app/data/config.ini");
@@ -115,6 +122,7 @@ foreach ($success as $entry) {
 </html>
 EOF
 
+# PHP Log viewer
 cat > /app/data/public/log.php <<'EOF'
 <?php
 if (file_exists("/tmp/yt-dlp.log") && filesize("/tmp/yt-dlp.log") > 5 * 1024 * 1024) {