From 8cea394ad0728ec7fa36ea94d98f1cc5c87fbe24 Mon Sep 17 00:00:00 2001 From: darkclip Date: Sat, 10 Jan 2026 08:20:06 +0800 Subject: [PATCH] update --- configure.sh | 7 +------ init.sh | 11 +++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/configure.sh b/configure.sh index 5441418..4514b6a 100755 --- a/configure.sh +++ b/configure.sh @@ -58,17 +58,12 @@ personalize() { usage(){ echo "Usage: $0 [OPTIONS]"; echo "OPTIONS:"; - echo " -n no install"; echo " -p personalize only"; } -DO_INSTALL=true; DO_SYS_CONFIG=true; while getopts ":np" OPT; do case $OPT in - n) - DO_INSTALL=false; - ;; p) DO_SYS_CONFIG=false; ;; @@ -82,4 +77,4 @@ done; if $DO_SYS_CONFIG; then configure fi -personalize $DO_INSTALL +personalize diff --git a/init.sh b/init.sh index f11dfb6..e0412be 100755 --- a/init.sh +++ b/init.sh @@ -9,6 +9,9 @@ case $OS_CODE in bookworm) OS_VERSION="12" ;; Trixie) OS_VERSION="13" ;; esac +if [ -z $OS_VERSION ]; then + echo "Unsupported Debian Code: $OS_CODE" && exit 1 +fi DISTRO_PVE=$((command -v pvesh &>/dev/null && echo 1) || echo 0) SCRIPT=$(readlink -f "$0") @@ -101,11 +104,7 @@ config(){ apt list nala ca-certificates curl gnupg gpg lsb-release git zsh | awk -F'/' '/\// {print $1}' | xargs -r apt install --no-install-recommends -y set_pkg_source apt update - if $1; then - $AWD/configure.sh - else - $AWD/configure.sh -n - fi + $AWD/configure.sh } usage(){ @@ -139,7 +138,7 @@ while getopts ":f:cm:" OPT; do esac; done; -config $DO_INSTALL +config if $DO_INSTALL; then $AWD/install.sh $PKG_BASE fi \ No newline at end of file