From addce6782f94594c28a4c9fe141fc0e9d57a6f4f Mon Sep 17 00:00:00 2001 From: bol-van Date: Wed, 31 Jul 2024 09:48:50 +0300 Subject: [PATCH] uninstall_easy, install_prereq: fix config/config.default logic --- install_prereq.sh | 1 + uninstall_easy.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/install_prereq.sh b/install_prereq.sh index f757358..df03a56 100755 --- a/install_prereq.sh +++ b/install_prereq.sh @@ -8,6 +8,7 @@ ZAPRET_CONFIG="$EXEDIR/config" ZAPRET_BASE="$EXEDIR" [ -f "$ZAPRET_CONFIG" ] || cp "${ZAPRET_CONFIG}.default" "$ZAPRET_CONFIG" +. "$ZAPRET_CONFIG" . "$ZAPRET_BASE/common/base.sh" . "$ZAPRET_BASE/common/elevate.sh" . "$ZAPRET_BASE/common/fwtype.sh" diff --git a/uninstall_easy.sh b/uninstall_easy.sh index 47126e6..38bcaa0 100755 --- a/uninstall_easy.sh +++ b/uninstall_easy.sh @@ -8,6 +8,7 @@ IPSET_DIR="$EXEDIR/ipset" ZAPRET_CONFIG="$EXEDIR/config" ZAPRET_BASE="$EXEDIR" +[ -f "$ZAPRET_CONFIG" ] || cp "${ZAPRET_CONFIG}.default" "$ZAPRET_CONFIG" . "$ZAPRET_CONFIG" . "$ZAPRET_BASE/common/base.sh" . "$ZAPRET_BASE/common/elevate.sh"