github/across
1
0
Fork 0
mirror of https://github.com/teddysun/across.git synced 2025-01-19 06:19:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix(wireguard.sh): issue#75 (#76)

Browse Source
This commit is contained in:
WALWIMP 2020-10-12 11:47:08 +08:00 committed by GitHub
parent 23068c8e06
commit 27c769528f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wireguard.sh
View File

@ -268,6 +268,13 @@ install_wg_pkgs() {
_error_detect "apt-get -y install make" _error_detect "apt-get -y install make"
_error_detect "apt-get -y install libmnl-dev" _error_detect "apt-get -y install libmnl-dev"
_error_detect "apt-get -y install libelf-dev" _error_detect "apt-get -y install libelf-dev"
if [ ! -d "/usr/src/linux-headers-$(uname -r)" ]; then
if [ "$(_os)" = "raspbian" ]; then
_error_detect "apt-get -y install raspberrypi-kernel-headers"
else
_error_detect "apt-get -y install linux-headers-$(uname -r)"
fi
fi
;; ;;
fedora) fedora)
_error_detect "dnf -y install qrencode" _error_detect "dnf -y install qrencode"
@ -276,6 +283,7 @@ install_wg_pkgs() {
_error_detect "dnf -y install make" _error_detect "dnf -y install make"
_error_detect "dnf -y install libmnl-devel" _error_detect "dnf -y install libmnl-devel"
_error_detect "dnf -y install elfutils-libelf-devel" _error_detect "dnf -y install elfutils-libelf-devel"
[ ! -d "/usr/src/kernels/$(uname -r)" ] && _error_detect "dnf -y install kernel-headers" && _error_detect "dnf -y install kernel-devel"
;; ;;
centos) centos)
_error_detect "yum -y install epel-release" _error_detect "yum -y install epel-release"
@ -287,6 +295,7 @@ install_wg_pkgs() {
[ -n "$(_os_ver)" -a "$(_os_ver)" -eq 8 ] && _error_detect "yum-config-manager --enable PowerTools" [ -n "$(_os_ver)" -a "$(_os_ver)" -eq 8 ] && _error_detect "yum-config-manager --enable PowerTools"
_error_detect "yum -y install libmnl-devel" _error_detect "yum -y install libmnl-devel"
_error_detect "yum -y install elfutils-libelf-devel" _error_detect "yum -y install elfutils-libelf-devel"
[ ! -d "/usr/src/kernels/$(uname -r)" ] && _error_detect "yum -y install kernel-headers" && _error_detect "yum -y install kernel-devel"
;; ;;
*) *)
;; # do nothing ;; # do nothing
@ -323,8 +332,6 @@ install_wg_1() {
if [ -n "$(_os_ver)" -a "$(_os_ver)" -eq 8 ]; then if [ -n "$(_os_ver)" -a "$(_os_ver)" -eq 8 ]; then
_error_detect "curl -Lso /etc/yum.repos.d/wireguard.repo https://copr.fedorainfracloud.org/coprs/jdoss/wireguard/repo/epel-8/jdoss-wireguard-epel-8.repo" _error_detect "curl -Lso /etc/yum.repos.d/wireguard.repo https://copr.fedorainfracloud.org/coprs/jdoss/wireguard/repo/epel-8/jdoss-wireguard-epel-8.repo"
fi fi
_error_detect "yum -y install kernel-devel"
_error_detect "yum -y install kernel-headers"
_error_detect "yum -y install wireguard-dkms" _error_detect "yum -y install wireguard-dkms"
_error_detect "yum -y install wireguard-tools" _error_detect "yum -y install wireguard-tools"
;; ;;
@ -337,25 +344,6 @@ install_wg_1() {
install_wg_2() { install_wg_2() {
install_wg_pkgs install_wg_pkgs
_info "Install wireguard from source" _info "Install wireguard from source"
case "$(_os)" in
ubuntu|debian|raspbian)
if [ ! -d "/usr/src/linux-headers-$(uname -r)" ]; then
if [ "$(_os)" = "raspbian" ]; then
_error_detect "apt-get -y install raspberrypi-kernel-headers"
else
_error_detect "apt-get -y install linux-headers-$(uname -r)"
fi
fi
;;
fedora)
[ ! -d "/usr/src/kernels/$(uname -r)" ] && _error_detect "dnf -y install kernel-headers" && _error_detect "dnf -y install kernel-devel"
;;
centos)
[ ! -d "/usr/src/kernels/$(uname -r)" ] && _error_detect "yum -y install kernel-headers" && _error_detect "yum -y install kernel-devel"
;;
*)
;; # do nothing
esac
install_wg_module install_wg_module
install_wg_tools install_wg_tools
} }