Merge a025e1a0f5bd112fc63908ff5a8843ec09cfe747 into b47964ff957ea09603d0e3dd3491d4a8802f6fd7

This commit is contained in:
IceCodeNew 2020-08-13 14:58:35 +08:00 committed by GitHub
commit 02facf78cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -200,7 +200,7 @@ check_os() {
fi fi
[ -z "$(_os)" ] && _error "Not supported OS" [ -z "$(_os)" ] && _error "Not supported OS"
case "$(_os)" in case "$(_os)" in
ubuntu) ubuntu|pop)
[ -n "$(_os_ver)" -a "$(_os_ver)" -lt 16 ] && _error "Not supported OS, please change to Ubuntu 16+ and try again." [ -n "$(_os_ver)" -a "$(_os_ver)" -lt 16 ] && _error "Not supported OS, please change to Ubuntu 16+ and try again."
;; ;;
debian|raspbian) debian|raspbian)
@ -259,7 +259,7 @@ install_wg_tools() {
install_wg_pkgs() { install_wg_pkgs() {
_info "Install dependencies for wireguard" _info "Install dependencies for wireguard"
case "$(_os)" in case "$(_os)" in
ubuntu|debian|raspbian) ubuntu|pop|debian|raspbian)
_error_detect "apt-get update" _error_detect "apt-get update"
_error_detect "apt-get -y install qrencode" _error_detect "apt-get -y install qrencode"
_error_detect "apt-get -y install iptables" _error_detect "apt-get -y install iptables"
@ -298,7 +298,7 @@ install_wg_1() {
install_wg_pkgs install_wg_pkgs
_info "Install wireguard from repository" _info "Install wireguard from repository"
case "$(_os)" in case "$(_os)" in
ubuntu) ubuntu|pop)
_error_detect "add-apt-repository ppa:wireguard/wireguard" _error_detect "add-apt-repository ppa:wireguard/wireguard"
_error_detect "apt-get update" _error_detect "apt-get update"
_error_detect "apt-get -y install linux-headers-$(uname -r)" _error_detect "apt-get -y install linux-headers-$(uname -r)"
@ -342,7 +342,7 @@ install_wg_2() {
install_wg_pkgs install_wg_pkgs
_info "Install wireguard from source" _info "Install wireguard from source"
case "$(_os)" in case "$(_os)" in
ubuntu|debian|raspbian) ubuntu|pop|debian|raspbian)
if [ ! -d "/usr/src/linux-headers-$(uname -r)" ]; then if [ ! -d "/usr/src/linux-headers-$(uname -r)" ]; then
if [ "$(_os)" = "raspbian" ]; then if [ "$(_os)" = "raspbian" ]; then
_error_detect "apt-get -y install raspberrypi-kernel-headers" _error_detect "apt-get -y install raspberrypi-kernel-headers"
@ -369,7 +369,7 @@ install_wg_3() {
install_wg_pkgs install_wg_pkgs
_info "Install wireguard from repository" _info "Install wireguard from repository"
case "$(_os)" in case "$(_os)" in
ubuntu) ubuntu|pop)
_error_detect "add-apt-repository ppa:wireguard/wireguard" _error_detect "add-apt-repository ppa:wireguard/wireguard"
_error_detect "apt-get update" _error_detect "apt-get update"
_error_detect "apt-get -y install --no-install-recommends wireguard-tools" _error_detect "apt-get -y install --no-install-recommends wireguard-tools"