Skip to content

Commit 1e27429

Browse files
committed
Fixed ini-file parsing
1 parent e8adb38 commit 1e27429

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

deploy_config.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ password = YourSuperSecurePassword#@#$*
1717
# verify sets whether the script will attempt to verify the server's certificate with a HTTPS
1818
# connection. Set to true if you're using a HTTPS connection to a remote host. If connect_host
1919
# is set to localhost (or is unset), set to false. Default is false.
20-
# verify = false
20+
# verify = true
2121

2222
# privkey_path is the path to the certificate private key on your system. Default
2323
# assumes you're using acme.sh:

deploy_freenas.sh

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,15 @@ _parse_ini() {
5555
if [ ! -f "$inFile" ]; then _err "File $inFile not found!"; exit 1; fi
5656

5757
local IFS="="
58-
echo "[]" | cat "$inFile" - | sed 's/\t/ /g;s/^ +//;s/ +$//;/^#/d;/^$/d' | while read name value; do
59-
name=${name/ /}
58+
echo "[]" | cat "$inFile" - | sed 's/\\t/ /g;s/^ +//;s/ +$//;/^#/d;/^$/d' | while read name value; do
59+
name=$(echo ${name} | sed 's/ *$//')
6060
[ -z "$name" ] && continue
6161

6262
local IFS=" "
63-
if [ "${name:0:1}" == "[" ]; then
64-
section=${name/'['/}
65-
section=${section/']'/}
63+
if [ $(echo ${name} | cut -c 1-1) == "[" ]; then
64+
section=$(echo ${name} | sed 's/\[//;s/\]//')
6665
else
67-
value=${value/# /}
68-
value=${value/% /}
69-
value=${value/#\"/}
70-
value=${value/%\"/}
71-
72-
value=${value//\"/\\\"}
66+
value=$(echo ${value} | sed 's/[#%][ "]//;s/"/\\"/')
7367
echo "${prefix}__${section}__${name}=\"${value}\""
7468
fi
7569
local IFS="="

0 commit comments

Comments
 (0)