Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-18 10:50:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Shellcheck compliance

Browse source 
scripts/wireguard/disableCONF.sh
  * Mapfile instead of double quoted LIST=("$(...)")
scripts/wireguard/enableCONF.sh
  * SC1090: ShellCheck can't follow non-constant source. Use a directive to specify location.
    * Disabled warning
  * SC2207: Prefer mapfile or read -a to split command output (or quote to avoid splitting).
    * Changed to mapfile
  * SC2086: Double quote to prevent globbing and word splitting.
    * Added double quotes
This commit is contained in:
4s3ti 2021-11-03 15:38:45 +01:00
parent fb71fdd9fd
commit 2a78fce9d3
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/wireguard/disableCONF.sh
View file

@ -58,7 +58,7 @@ if [ "$DISPLAY_DISABLED" ]; then
fi fi
LIST=("$(awk '{print $1}' configs/clients.txt)") mapfile -t LIST < <(awk '{print $1}' configs/clients.txt)
if [ "${#CLIENTS_TO_CHANGE[@]}" -eq 0 ]; then if [ "${#CLIENTS_TO_CHANGE[@]}" -eq 0 ]; then
echo -e "::\e[4m Client list \e[0m::" echo -e "::\e[4m Client list \e[0m::"
len=${#LIST[@]} len=${#LIST[@]}

9
scripts/wireguard/enableCONF.sh
View file

@ -7,6 +7,7 @@ if [ ! -f "${setupVars}" ]; then
exit 1 exit 1
fi fi
# shellcheck disable=SC1090
source "${setupVars}" source "${setupVars}"
helpFunc(){ helpFunc(){
@ -55,13 +56,13 @@ if [ "$DISPLAY_DISABLED" ]; then
exit 1 exit 1
fi fi
LIST=($(awk '{print $1}' configs/clients.txt)) mapfile -t LIST < <(awk '{print $1}' configs/clients.txt)
if [ "${#CLIENTS_TO_CHANGE[@]}" -eq 0 ]; then if [ "${#CLIENTS_TO_CHANGE[@]}" -eq 0 ]; then
echo -e "::\e[4m Client list \e[0m::" echo -e "::\e[4m Client list \e[0m::"
len=${#LIST[@]} len=${#LIST[@]}
COUNTER=1 COUNTER=1
while [ $COUNTER -le ${len} ]; do while [ $COUNTER -le "${len}" ]; do
printf "%0${#len}s) %s\r\n" ${COUNTER} ${LIST[(($COUNTER-1))]} printf "%0${#len}s) %s\r\n" "${COUNTER}" "${LIST[(($COUNTER-1))]}"
((COUNTER++)) ((COUNTER++))
done done
@ -94,7 +95,7 @@ for CLIENT_NAME in "${CLIENTS_TO_CHANGE[@]}"; do
if [[ $REPLY =~ ^[Yy]$ ]]; then if [[ $REPLY =~ ^[Yy]$ ]]; then
# Enable the peer section from the server config # Enable the peer section from the server config
echo "${CLIENT_NAME}" echo "${CLIENT_NAME}"
sed -e "/begin ${CLIENT_NAME}/,/end ${CLIENT_NAME}/ s/#\[disabled\] //" -i wg0.conf sed -e "/begin ${CLIENT_NAME}/,/end ${CLIENT_NAME}/ s/#\[disabled\] //" -i wg0.conf
echo "::: Updated server config" echo "::: Updated server config"