Skip to content

Commit 3b7be47

Browse files
authored
Fix stuff from tests
ShellCheck tests have brought up a couple of issues, that I was not aware of needed to be taken care. This should fix the tests.
1 parent 2014ca9 commit 3b7be47

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

dnsapi/dns_pleskxml.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,13 @@ _pleskxml_get_root_domain() {
386386
# We don't actually need to check for type, name, *and* id, but it guarantees only usable lines are returned.
387387

388388
output="$(_api_response_split "$pleskxml_prettyprint_result" 'result' '<status>ok</status>' | sed 's/<ascii-name>/<name>/g;s/<\/ascii-name>/<\/name>/g' | grep '<name>' | grep '<id>')"
389-
debug_output="$(printf "$output" | sed -n 's:.*<name>\(.*\)</name>.*:\1:p')"
390-
389+
debug_output="$(printf "%s" "$output" | sed -n 's:.*<name>\(.*\)</name>.*:\1:p')"
390+
391391
_debug 'Domains managed by Plesk server are:'
392-
_debug "$debug_output"
392+
_debug "$debug_output"
393393

394394
_debug "Querying Plesk server for list of additional managed domains..."
395-
395+
396396
_call_api "$pleskxml_tplt_get_additional_domains"
397397
if [ "$pleskxml_retcode" -ne 0 ]; then
398398
return 1
@@ -405,18 +405,18 @@ _pleskxml_get_root_domain() {
405405
# We don't actually need to check for type, name, *and* id, but it guarantees only usable lines are returned.
406406

407407
output_additional="$(_api_response_split "$pleskxml_prettyprint_result" 'result' '<status>ok</status>' | sed 's/<ascii-name>/<name>/g;s/<\/ascii-name>/<\/name>/g' | grep '<name>' | grep '<id>')"
408-
debug_additional="$(printf "$output_additional" | sed -n 's:.*<name>\(.*\)</name>.*:\1:p')"
408+
debug_additional="$(printf "%s" "$output_additional" | sed -n 's:.*<name>\(.*\)</name>.*:\1:p')"
409409

410410
_debug 'Additional domains managed by Plesk server are:'
411411
_debug "$debug_additional"
412-
412+
413413
# Concate the two outputs together.
414-
415-
output="$(printf "$output $NEWLINE $output_additional")"
416-
debug_output="$(printf "$output" | sed -n 's:.*<name>\(.*\)</name>.*:\1:p')"
417-
414+
415+
output="$(printf "%s" "$output $NEWLINE $output_additional")"
416+
debug_output="$(printf "%s" "$output" | sed -n 's:.*<name>\(.*\)</name>.*:\1:p')"
417+
418418
_debug 'Domains (including additional) managed by Plesk server are:'
419-
_debug "$debug_output"
419+
_debug "$debug_output"
420420

421421
# loop and test if domain, or any parent domain, is managed by Plesk
422422
# Loop until we don't have any '.' in the string we're testing as a candidate Plesk-managed domain

0 commit comments

Comments
 (0)