From 05de1554fa6aaed6e5cdfcbfb515fe023bfcb36b Mon Sep 17 00:00:00 2001 From: darkclip Date: Thu, 11 Jan 2024 04:23:12 +0800 Subject: [PATCH] update --- init.sh | 4 ++-- install.sh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/init.sh b/init.sh index 4974d0b..dc4b6c4 100755 --- a/init.sh +++ b/init.sh @@ -26,7 +26,7 @@ deb https://$mirror_site/debian-security $OS_CODE-security main contrib non-free command="nala" apt update apt install $command || command="apt" -test -f "$packages_base" +test -r "$packages_base" xargs -a <(awk '! /^ *(#|$)/' "$packages_base") -r $command install @@ -51,7 +51,7 @@ curl -fsSL "https://packagecloud.io/ookla/speedtest-cli/gpgkey" | \ gpg --dearmor | tee /etc/apt/trusted.gpg.d/ookla_speedtest-cli-archive-keyring.gpg > /dev/null $command update -test -f "$packages_addon" +test -r "$packages_addon" xargs -a <(awk '! /^ *(#|$)/' "$packages_addon") -r $command install cp .zshrc $HOME diff --git a/install.sh b/install.sh index 838e51e..56a23bd 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash +set -e -if [[ -z "$1" ]]; then - exit 1 -fi +test -r "$1" xargs -a <(awk '! /^ *(#|$)/' "$1") -r nala install