/ move ensure_jq where needed

This commit is contained in:
RadekSabacky
2025-11-18 16:38:01 +01:00
parent 4f991061dd
commit bdc0f5022d
@@ -12,24 +12,6 @@ if [ "$(id -u)" -ne 0 ]; then
exit 1
fi
echo "checking for jq..."
if command -v jq >/dev/null 2>&1; then
echo "jq is already installed"
# continue script execution
else
echo "jq not found, installing..."
apt-get update -y
DEBIAN_FRONTEND=noninteractive apt-get install -y jq
if command -v jq >/dev/null 2>&1; then
echo "jq installed successfully"
else
echo "failed to install jq"
exit 1
fi
fi
###############################################################################
# basic config
###############################################################################
@@ -51,7 +33,6 @@ detect_uplink_interface() {
fi
}
# uplink device detection, can be overridden
NETWORK_DEVICE="${NETWORK_DEVICE:-}"
if [[ -z "$NETWORK_DEVICE" ]]; then
@@ -79,6 +60,25 @@ NC='\033[0m'
# shared helpers
###############################################################################
ensure_jq() {
echo "checking for jq..."
if command -v jq >/dev/null 2>&1; then
echo "jq is already installed"
else
echo "jq not found, installing..."
apt-get update -y
DEBIAN_FRONTEND=noninteractive apt-get install -y jq
if command -v jq >/dev/null 2>&1; then
echo "jq installed successfully"
else
echo "failed to install jq"
exit 1
fi
fi
}
install_iptables_persistent() {
if ! dpkg -s iptables-persistent >/dev/null 2>&1; then
echo -e "${YELLOW}installing iptables-persistent${NC}"
@@ -283,9 +283,6 @@ remove_duplicate_rules() {
echo "duplicate rule scan completed for $interface"
}
apply_iptables_rules() {
local interface=$1
echo "applying iptables rules for $interface using uplink $NETWORK_DEVICE"
@@ -349,6 +346,7 @@ perform_pings() {
}
joke_through_tunnel() {
ensure_jq
local interface=$1
local green="\033[0;32m"
local reset="\033[0m"
@@ -905,6 +903,7 @@ test_forward_chain_hook() {
test_default_reject_rule() {
echo "testing default reject rule at end of ${NYM_CHAIN}"
# not sure this will really check that it is on end
if iptables -L "$NYM_CHAIN" | grep -q "REJECT"; then
echo "default reject present in ipv4 chain"
else