tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make mail-{host,service}-notification.sh as POSIX-compliant as possible.

This commit is contained in:
Martijn van Duren 2018-11-16 14:23:56 +01:00
parent aec0f6de15
commit a763e74a50
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
etc/icinga2/scripts/mail-host-notification.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
# #
# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) # Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
# Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license # Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license
@ -51,11 +51,14 @@ Error() {
} }
urlencode() { urlencode() {
local LANG=C i c e='' local LANG=C i=0 c e s="$1"
for ((i=0;i<${#1};i++)); do
c=${1:$i:1} while [ $i -lt ${#1} ]; do
[[ "$c" =~ [a-zA-Z0-9\.\~\_\-] ]] || printf -v c '%%%02X' "'$c" [ "$i" -eq 0 ] || s="${s#?}"
e+="$c" c=${s%"${s#?}"}
[ -z "${c#[[:alnum:].~_-]}" ] || c=$(printf '%%%02X' "'$c")
e="${e}${c}"
i=$((i + 1))
done done
echo "$e" echo "$e"
} }

15
etc/icinga2/scripts/mail-service-notification.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
# #
# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) # Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
# Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license # Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license
@ -53,11 +53,14 @@ Error() {
} }
urlencode() { urlencode() {
local LANG=C i c e='' local LANG=C i=0 c e s="$1"
for ((i=0;i<${#1};i++)); do
c=${1:$i:1} while [ $i -lt ${#1} ]; do
[[ "$c" =~ [a-zA-Z0-9\.\~\_\-] ]] || printf -v c '%%%02X' "'$c" [ "$i" -eq 0 ] || s="${s#?}"
e+="$c" c=${s%"${s#?}"}
[ -z "${c#[[:alnum:].~_-]}" ] || c=$(printf '%%%02X' "'$c")
e="${e}${c}"
i=$((i + 1))
done done
echo "$e" echo "$e"
} }