diff --git a/install.sh b/install.sh index d2f50c5..b234a62 100644 --- a/install.sh +++ b/install.sh @@ -15,6 +15,8 @@ LOG_TMPFS_SIZE="${LOG_TMPFS_SIZE:-15m}" PANEL_LOG_MAX_BYTES="${PANEL_LOG_MAX_BYTES:-1048576}" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" GO_VERSION="${GO_VERSION:-$(awk '$1 == "go" {print $2; exit}' "$SCRIPT_DIR/go.mod" 2>/dev/null || echo "1.22.5")}" +MKDIR_BIN="$(command -v mkdir 2>/dev/null || true)" +[[ -n "$MKDIR_BIN" ]] || MKDIR_BIN="/bin/mkdir" # ──────────────────────────────────────────────────────────────────────────── [[ $EUID -ne 0 ]] && error "Run as root: sudo bash $0" @@ -457,7 +459,7 @@ WorkingDirectory=${INSTALL_DIR} EnvironmentFile=${INSTALL_DIR}/.env Environment=PANEL_LOG_FILE=${INSTALL_DIR}/logs/panel.log Environment=PANEL_LOG_MAX_BYTES=${PANEL_LOG_MAX_BYTES} -ExecStartPre=/usr/bin/mkdir -p ${INSTALL_DIR}/logs +ExecStartPre=${MKDIR_BIN} -p ${INSTALL_DIR}/logs ExecStartPre=/bin/sh -c '/usr/bin/mountpoint -q ${INSTALL_DIR}/logs || /usr/bin/mount -t tmpfs -o size=${LOG_TMPFS_SIZE},mode=0755 tmpfs ${INSTALL_DIR}/logs || true' ExecStartPre=/bin/sh -c '/usr/bin/touch ${INSTALL_DIR}/logs/panel.log && /usr/bin/chmod 0644 ${INSTALL_DIR}/logs/panel.log || true' ExecStart=${INSTALL_DIR}/sshpanel -config ${INSTALL_DIR}/config.json diff --git a/update.sh b/update.sh index 49bb1be..fe97faa 100644 --- a/update.sh +++ b/update.sh @@ -31,6 +31,8 @@ PANEL_LOG_MAX_BYTES="${PANEL_LOG_MAX_BYTES:-1048576}" REPO_URL="${REPO_URL:-https://git.dr2.site/penguinehis/DragonCoreSSH-NewWEB.git}" UPDATE_REF="${UPDATE_REF:-}" SOURCE_CACHE_DIR="${SOURCE_CACHE_DIR:-${INSTALL_DIR}/source}" +MKDIR_BIN="$(command -v mkdir 2>/dev/null || true)" +[[ -n "$MKDIR_BIN" ]] || MKDIR_BIN="/bin/mkdir" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SOURCE_DIR="" RESTART_NEEDED=false @@ -345,7 +347,7 @@ write_sshpanel_systemd_override() { echo "Environment=PANEL_LOG_FILE=${INSTALL_DIR}/logs/panel.log" echo "Environment=PANEL_LOG_MAX_BYTES=${PANEL_LOG_MAX_BYTES}" echo "ExecStartPre=" - echo "ExecStartPre=/usr/bin/mkdir -p ${INSTALL_DIR}/logs" + echo "ExecStartPre=${MKDIR_BIN} -p ${INSTALL_DIR}/logs" echo "ExecStartPre=/bin/sh -c '/usr/bin/mountpoint -q ${INSTALL_DIR}/logs || /usr/bin/mount -t tmpfs -o size=${LOG_TMPFS_SIZE},mode=0755 tmpfs ${INSTALL_DIR}/logs || true'" echo "ExecStartPre=/bin/sh -c '/usr/bin/touch ${INSTALL_DIR}/logs/panel.log && /usr/bin/chmod 0644 ${INSTALL_DIR}/logs/panel.log || true'" echo "StandardOutput=append:${INSTALL_DIR}/logs/panel.log"