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

Merge pull request #1165 from xptsp/test

Browse source 
Handles special characters better
This commit is contained in:
Orazio 2020-10-24 13:51:20 +02:00 committed by GitHub
commit 9f057df25f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/openvpn/listOVPN.sh
View file

@ -28,13 +28,13 @@ while read -r line || [ -n "$line" ]; do
EXPD=$(echo "$line" | awk '{if (length($2) == 15) print $2; else print "20"$2}' | cut -b 1-8 | date +"%b %d %Y" -f -) EXPD=$(echo "$line" | awk '{if (length($2) == 15) print $2; else print "20"$2}' | cut -b 1-8 | date +"%b %d %Y" -f -)
if [ "${STATUS}" == "V" ]; then if [ "${STATUS}" == "V" ]; then
printf "Valid \t %s \t %s\\n" "$NAME" "$EXPD" printf "Valid \t %s \t %s\\n" "$(echo -e "$NAME")" "$EXPD"
elif [ "${STATUS}" == "R" ]; then elif [ "${STATUS}" == "R" ]; then
printf "Revoked \t %s \t %s\\n" "$NAME" "$EXPD" printf "Revoked \t %s \t %s\\n" "$(echo -e "$NAME")" "$EXPD"
elif [ "${STATUS}" == "E" ]; then elif [ "${STATUS}" == "E" ]; then
printf "Expired \t %s \t %s\\n" "$NAME" "$EXPD" printf "Expired \t %s \t %s\\n" "$(echo -e "$NAME")" "$EXPD"
else else
printf "Unknown \t %s \t %s\\n" "$NAME" "$EXPD" printf "Unknown \t %s \t %s\\n" "$(echo -e "$NAME")" "$EXPD"
fi fi
done <${INDEX} done <${INDEX}

4
scripts/openvpn/removeOVPN.sh
View file

@ -58,7 +58,7 @@ if [[ -z "${CERTS_TO_REVOKE}" ]]; then
NAME=$(echo "$line" | sed -e 's:.*/CN=::') NAME=$(echo "$line" | sed -e 's:.*/CN=::')
if [ "$i" != 0 ]; then if [ "$i" != 0 ]; then
# Prevent printing "server" certificate # Prevent printing "server" certificate
CERTS[$i]=${NAME} CERTS[$i]=$(echo -e "${NAME}")
fi fi
let i=i+1 let i=i+1
fi fi
@ -102,7 +102,7 @@ else
while read -r line || [ -n "$line" ]; do while read -r line || [ -n "$line" ]; do
STATUS=$(echo "$line" | awk '{print $1}') STATUS=$(echo "$line" | awk '{print $1}')
if [[ "${STATUS}" = "V" ]]; then if [[ "${STATUS}" = "V" ]]; then
NAME=$(echo "$line" | sed -e 's:.*/CN=::') NAME=$(echo -e "$line" | sed -e 's:.*/CN=::')
CERTS[$i]=${NAME} CERTS[$i]=${NAME}
let i=i+1 let i=i+1
fi fi