mirror of
https://github.com/pivpn/pivpn.git
synced 2024-12-18 19:00:15 +00:00
refactor(installer): fix the code style
Fix the code style
This commit is contained in:
parent
3a2466df31
commit
82a7cbfc27
1 changed files with 11 additions and 31 deletions
|
@ -659,38 +659,27 @@ preconfigurePackages() {
|
||||||
if
|
if
|
||||||
# If the module is builtin and the package available, we only need
|
# If the module is builtin and the package available, we only need
|
||||||
# to install wireguard-tools.
|
# to install wireguard-tools.
|
||||||
[[ "${WIREGUARD_BUILTIN}" -eq 1 &&
|
[[ "${WIREGUARD_BUILTIN}" -eq 1 && -n "${AVAILABLE_WIREGUARD}" ]] ||
|
||||||
-n "${AVAILABLE_WIREGUARD}" ]] ||
|
|
||||||
# If the package is not available, on Debian and Raspbian we can
|
# If the package is not available, on Debian and Raspbian we can
|
||||||
# add it via Bullseye repository.
|
# add it via Bullseye repository.
|
||||||
[[ "${WIREGUARD_BUILTIN}" -eq 1 &&
|
[[ "${WIREGUARD_BUILTIN}" -eq 1 && ("${PLAT}" == 'Debian' || "${PLAT}" == 'Raspbian') ]] ||
|
||||||
("${PLAT}" == 'Debian' || "${PLAT}" == 'Raspbian') ]] ||
|
|
||||||
# If the module is not builtin, on Raspbian we know the headers
|
# If the module is not builtin, on Raspbian we know the headers
|
||||||
# package: raspberrypi-kernel-headers
|
# package: raspberrypi-kernel-headers
|
||||||
[[ "${PLAT}" == 'Raspbian' ]] ||
|
[[ "${PLAT}" == 'Raspbian' ]] ||
|
||||||
# On Alpine, the kernel must be linux-lts or linux-virt if we want to
|
# On Alpine, the kernel must be linux-lts or linux-virt if we want to
|
||||||
# load the kernel module
|
# load the kernel module
|
||||||
[[ "${PLAT}" == 'Alpine' &&
|
[[ "${PLAT}" == 'Alpine' && ! -f /.dockerenv && "$(uname -mrs)" =~ ^Linux\ +[0-9\.\-]+\-((lts)|(virt))\ +.*$ ]] ||
|
||||||
! -f /.dockerenv &&
|
|
||||||
"$(uname -mrs)" =~ ^Linux\ +[0-9\.\-]+\-((lts)|(virt))\ +.*$ ]] ||
|
|
||||||
# On Alpine Docker Container, the responsibility to have a WireGuard
|
# On Alpine Docker Container, the responsibility to have a WireGuard
|
||||||
# module on the host system is at user side
|
# module on the host system is at user side
|
||||||
[[ "${PLAT}" == 'Alpine' &&
|
[[ "${PLAT}" == 'Alpine' && -f /.dockerenv ]] ||
|
||||||
-f /.dockerenv ]] ||
|
|
||||||
# On Debian (and Ubuntu), we can only reliably assume the headers package
|
# On Debian (and Ubuntu), we can only reliably assume the headers package
|
||||||
# for amd64: linux-image-amd64
|
# for amd64: linux-image-amd64
|
||||||
[[ "${PLAT}" == 'Debian' &&
|
[[ "${PLAT}" == 'Debian' && "${DPKG_ARCH}" == 'amd64' ]] ||
|
||||||
"${DPKG_ARCH}" == 'amd64' ]] ||
|
|
||||||
# On Ubuntu, additionally the WireGuard package needs to be available,
|
# On Ubuntu, additionally the WireGuard package needs to be available,
|
||||||
# since we didn't test mixing Ubuntu repositories.
|
# since we didn't test mixing Ubuntu repositories.
|
||||||
[[ "${PLAT}" == 'Ubuntu' &&
|
[[ "${PLAT}" == 'Ubuntu' && "${DPKG_ARCH}" == 'amd64' && -n "${AVAILABLE_WIREGUARD}" ]] ||
|
||||||
"${DPKG_ARCH}" == 'amd64' &&
|
|
||||||
-n "${AVAILABLE_WIREGUARD}" ]] ||
|
|
||||||
# Ubuntu focal has wireguard support
|
# Ubuntu focal has wireguard support
|
||||||
[[ "${PLAT}" == 'Ubuntu' &&
|
[[ "${PLAT}" == 'Ubuntu' && "${DPKG_ARCH}" == 'arm64' && "${OSCN}" == 'focal' && -n "${AVAILABLE_WIREGUARD}" ]]
|
||||||
"${DPKG_ARCH}" == 'arm64' &&
|
|
||||||
"${OSCN}" == 'focal' &&
|
|
||||||
-n "${AVAILABLE_WIREGUARD}" ]]
|
|
||||||
then
|
then
|
||||||
WIREGUARD_SUPPORT=1
|
WIREGUARD_SUPPORT=1
|
||||||
fi
|
fi
|
||||||
|
@ -1060,10 +1049,7 @@ validIP() {
|
||||||
read -r -a ip <<< "${ip}"
|
read -r -a ip <<< "${ip}"
|
||||||
IFS="${OIFS}"
|
IFS="${OIFS}"
|
||||||
|
|
||||||
[[ "${ip[0]}" -le 255 &&
|
[[ "${ip[0]}" -le 255 && "${ip[1]}" -le 255 && "${ip[2]}" -le 255 && "${ip[3]}" -le 255 ]]
|
||||||
"${ip[1]}" -le 255 &&
|
|
||||||
"${ip[2]}" -le 255 &&
|
|
||||||
"${ip[3]}" -le 255 ]]
|
|
||||||
|
|
||||||
stat="$?"
|
stat="$?"
|
||||||
fi
|
fi
|
||||||
|
@ -1087,11 +1073,7 @@ validIPAndNetmask() {
|
||||||
read -r -a ip <<< "${ip}"
|
read -r -a ip <<< "${ip}"
|
||||||
IFS="${OIFS}"
|
IFS="${OIFS}"
|
||||||
|
|
||||||
[[ "${ip[0]}" -le 255 &&
|
[[ "${ip[0]}" -le 255 && "${ip[1]}" -le 255 && "${ip[2]}" -le 255 && "${ip[3]}" -le 255 && "${ip[4]}" -le 32 ]]
|
||||||
"${ip[1]}" -le 255 &&
|
|
||||||
"${ip[2]}" -le 255 &&
|
|
||||||
"${ip[3]}" -le 255 &&
|
|
||||||
"${ip[4]}" -le 32 ]]
|
|
||||||
|
|
||||||
stat="$?"
|
stat="$?"
|
||||||
fi
|
fi
|
||||||
|
@ -1587,8 +1569,7 @@ updateRepo() {
|
||||||
--no-single-branch \
|
--no-single-branch \
|
||||||
"${2}" \
|
"${2}" \
|
||||||
"${1}" \
|
"${1}" \
|
||||||
> /dev/null \
|
> /dev/null &
|
||||||
&
|
|
||||||
spinner $!
|
spinner $!
|
||||||
cd "${1}" || exit 1
|
cd "${1}" || exit 1
|
||||||
echo " done!"
|
echo " done!"
|
||||||
|
@ -1626,8 +1607,7 @@ makeRepo() {
|
||||||
--no-single-branch \
|
--no-single-branch \
|
||||||
"${2}" \
|
"${2}" \
|
||||||
"${1}" \
|
"${1}" \
|
||||||
> /dev/null \
|
> /dev/null &
|
||||||
&
|
|
||||||
spinner $!
|
spinner $!
|
||||||
cd "${1}" || exit 1
|
cd "${1}" || exit 1
|
||||||
echo " done!"
|
echo " done!"
|
||||||
|
|
Loading…
Reference in a new issue