From 5b8d822011175b5e34db34d3a23f6d263bc64593 Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 8 Feb 2025 02:33:07 -0800 Subject: [PATCH] Patches applied from parent repo --- .github/workflows/release.yml | 2 +- installers/raspbian.sh | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4eac8c5c..66c952ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: cat > stage-raspap/package-raspap/00-run-chroot.sh <<-EOF #!/bin/bash apt-get update -y && apt-get install -y curl dhcpcd5 iptables procps - curl -sL https://install.raspap.com | bash -s -- --yes --openvpn 1 --restapi 1 --adblock 1 --wireguard 1 --tcp-bbr 1 + curl -sL https://install.raspap.com | bash -s -- --yes --openvpn 1 --restapi 1 --adblock 1 --wireguard 1 --tcp-bbr 1 --check 0 EOF } && chmod +x stage-raspap/package-raspap/00-run-chroot.sh && diff --git a/installers/raspbian.sh b/installers/raspbian.sh index 8d8c669a..27f576fb 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -54,6 +54,7 @@ OPTIONS: -p, --path Used with -d, --update, sets the existing install path -i, --insiders Installs from the Insiders Edition (RaspAP/raspap-insiders) -m, --minwrite Configures a microSD card for minimum write operation +-k, --check Sets the connectivity check flag (default is 1=perform check) -v, --version Outputs release info and exits -n, --uninstall Loads and executes the uninstaller -h, --help Outputs usage notes and exits @@ -81,13 +82,16 @@ EOF set -eo pipefail function _main() { - _setup_colors - _check_internet - # set defaults repo="RaspAP/raspap-webgui" # override with -r, --repo option repo_common="$repo" + _parse_params "$@" + _setup_colors + if [ "${check}" == 1 ]; then + _check_internet + fi + _log_output _load_installer } @@ -105,6 +109,7 @@ function _parse_params() { minwrite=0 acctoken="" path="" + check=1 while :; do case "${1-}" in @@ -175,6 +180,10 @@ function _parse_params() { path="$2" shift ;; + -k|--check) + check="$2" + shift + ;; -v|--version) _version ;;