mirror of
https://github.com/billz/raspap-webgui.git
synced 2025-03-01 10:31:47 +00:00
Patches applied from parent repo
This commit is contained in:
parent
3417115a84
commit
5b8d822011
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@ -29,7 +29,7 @@ jobs:
|
|||||||
cat > stage-raspap/package-raspap/00-run-chroot.sh <<-EOF
|
cat > stage-raspap/package-raspap/00-run-chroot.sh <<-EOF
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
apt-get update -y && apt-get install -y curl dhcpcd5 iptables procps
|
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
|
EOF
|
||||||
} &&
|
} &&
|
||||||
chmod +x stage-raspap/package-raspap/00-run-chroot.sh &&
|
chmod +x stage-raspap/package-raspap/00-run-chroot.sh &&
|
||||||
|
@ -54,6 +54,7 @@ OPTIONS:
|
|||||||
-p, --path <path> Used with -d, --update, sets the existing install path
|
-p, --path <path> Used with -d, --update, sets the existing install path
|
||||||
-i, --insiders Installs from the Insiders Edition (RaspAP/raspap-insiders)
|
-i, --insiders Installs from the Insiders Edition (RaspAP/raspap-insiders)
|
||||||
-m, --minwrite Configures a microSD card for minimum write operation
|
-m, --minwrite Configures a microSD card for minimum write operation
|
||||||
|
-k, --check <flag> Sets the connectivity check flag (default is 1=perform check)
|
||||||
-v, --version Outputs release info and exits
|
-v, --version Outputs release info and exits
|
||||||
-n, --uninstall Loads and executes the uninstaller
|
-n, --uninstall Loads and executes the uninstaller
|
||||||
-h, --help Outputs usage notes and exits
|
-h, --help Outputs usage notes and exits
|
||||||
@ -81,13 +82,16 @@ EOF
|
|||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|
||||||
function _main() {
|
function _main() {
|
||||||
_setup_colors
|
|
||||||
_check_internet
|
|
||||||
|
|
||||||
# set defaults
|
# set defaults
|
||||||
repo="RaspAP/raspap-webgui" # override with -r, --repo option
|
repo="RaspAP/raspap-webgui" # override with -r, --repo option
|
||||||
repo_common="$repo"
|
repo_common="$repo"
|
||||||
|
|
||||||
_parse_params "$@"
|
_parse_params "$@"
|
||||||
|
_setup_colors
|
||||||
|
if [ "${check}" == 1 ]; then
|
||||||
|
_check_internet
|
||||||
|
fi
|
||||||
|
|
||||||
_log_output
|
_log_output
|
||||||
_load_installer
|
_load_installer
|
||||||
}
|
}
|
||||||
@ -105,6 +109,7 @@ function _parse_params() {
|
|||||||
minwrite=0
|
minwrite=0
|
||||||
acctoken=""
|
acctoken=""
|
||||||
path=""
|
path=""
|
||||||
|
check=1
|
||||||
|
|
||||||
while :; do
|
while :; do
|
||||||
case "${1-}" in
|
case "${1-}" in
|
||||||
@ -175,6 +180,10 @@ function _parse_params() {
|
|||||||
path="$2"
|
path="$2"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
-k|--check)
|
||||||
|
check="$2"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
-v|--version)
|
-v|--version)
|
||||||
_version
|
_version
|
||||||
;;
|
;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user