From 43697716ae42c4d537a5fee81b95d915e0e0385c Mon Sep 17 00:00:00 2001 From: Michel Roegl-Brunner <73236783+michelroegl-brunner@users.noreply.github.com> Date: Mon, 2 Jun 2025 14:16:11 +0200 Subject: [PATCH] Various fixes (#4924) --- misc/build.func | 8 +++++--- misc/config-file.func | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/misc/build.func b/misc/build.func index 00bf82ad8..7c127b248 100644 --- a/misc/build.func +++ b/misc/build.func @@ -385,7 +385,7 @@ HN="${HN}" BRG="${BRG}" APT_CACHER_IP="${APT_CACHER_IP:-none}" DISABLEIP6="${DISABLEIP6}" -PW="${PW:-none}" +PW='${PW:-none}' SSH="${SSH}" SSH_AUTHORIZED_KEY="${SSH_AUTHORIZED_KEY}" VERBOSE="${VERBOSE}" @@ -397,6 +397,7 @@ SD="${SD:-none}" MAC="${MAC:-none}" NS="${NS:-none}" NET="${NET}" +FUSE="${ENABLE_FUSE}" EOF echo -e "${INFO}${BOLD}${GN}Writing configuration to ${FILEPATH}${CL}" @@ -416,7 +417,7 @@ HN="${HN}" BRG="${BRG}" APT_CACHER_IP="${APT_CACHER_IP:-none}" DISABLEIP6="${DISABLEIP6}" -PW="${PW:-none}" +PW='${PW:-none}' SSH="${SSH}" SSH_AUTHORIZED_KEY="${SSH_AUTHORIZED_KEY}" VERBOSE="${VERBOSE}" @@ -428,6 +429,7 @@ SD="${SD:-none}" MAC="${MAC:-none}" NS="${NS:-none}" NET="${NET}" +FUSE="${ENABLE_FUSE}" EOF echo -e "${INFO}${BOLD}${GN}Writing configuration to ${FILEPATH}${CL}" @@ -795,7 +797,7 @@ advanced_settings() { echo -e "${ROOTSSH}${BOLD}${DGN}Root SSH Access: ${BGN}$SSH${CL}" fi - if (whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --defaultno --title "FUSE Support" --yesno "Enable FUSE support?\nRequired for tools like rclone, mergerfs, AppImage, etc." 10 58); then + if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "FUSE Support" --yesno "Enable FUSE support?\nRequired for tools like rclone, mergerfs, AppImage, etc." 10 58); then ENABLE_FUSE="yes" else ENABLE_FUSE="no" diff --git a/misc/config-file.func b/misc/config-file.func index 01e8af66e..efaa2de82 100644 --- a/misc/config-file.func +++ b/misc/config-file.func @@ -618,6 +618,24 @@ config_file() { fi fi + if [[ -n "$ENABLE_FUSE" ]]; then + if [[ "$ENABLE_FUSE" == "yes" ]]; then + echo -e "${FUSE}${BOLD}${DGN}Enable FUSE: ${BGN}Yes${CL}" + elif [[ "$ENABLE_FUSE" == "no" ]]; then + echo -e "${FUSE}${BOLD}${DGN}Enable FUSE: ${BGN}No${CL}" + else + msg_error "Enable FUSE needs to be 'yes' or 'no', was ${ENABLE_FUSE}" + exit + fi + else + if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "FUSE" --yesno "Enable FUSE?" 10 58); then + ENABLE_FUSE="yes" + else + ENABLE_FUSE="no" + fi + echo -e "${FUSE}${BOLD}${DGN}Enable FUSE: ${BGN}$ENABLE_FUSE${CL}" + fi + if [[ -n "${VERBOSE-}" ]]; then if [[ "$VERBOSE" == "yes" ]]; then echo -e "${SEARCH}${BOLD}${DGN}Verbose Mode: ${BGN}$VERBOSE${CL}"