diff --git a/dnsapi/dns_inwx.sh b/dnsapi/dns_inwx.sh
index 78e101e9..2a2895f1 100755
--- a/dnsapi/dns_inwx.sh
+++ b/dnsapi/dns_inwx.sh
@@ -37,7 +37,7 @@ dns_inwx_add() {
_debug _domain "$_domain"
_debug "Getting txt records"
- printf -v xml_content '
+ xml_content=$(printf '
nameserver.info
@@ -66,7 +66,7 @@ dns_inwx_add() {
- ' "$_domain" "$_sub_domain"
+ ' "$_domain" "$_sub_domain")
response="$(_post "$xml_content" "$INWX_Api" "" "POST")"
if ! printf "%s" "$response" | grep "Command completed successfully" >/dev/null; then
@@ -74,11 +74,11 @@ dns_inwx_add() {
return 1
fi
- if ! printf "%s" "$response" | grep "count" -q; then
+ if ! printf "%s" "$response" | grep "count" >/dev/null; then
_info "Adding record"
_inwx_add_record "$_domain" "$_sub_domain" "$txtvalue"
else
- _record_id=$(printf '%s' "$response" | sed -nE 's/.*(record){1}(.*)(id<\/name>)([0-9]+){1}.*/\4/p')
+ _record_id=$(printf '%s' "$response" | _egrep_o '.*(record){1}(.*)([0-9]+){1}' | _egrep_o 'id<\/name>[0-9]+' | egrep -o '[0-9]+')
_info "Updating record"
_inwx_update_record "$_record_id" "$txtvalue"
fi
@@ -115,7 +115,7 @@ dns_inwx_rm() {
_debug "Getting txt records"
- printf -v xml_content '
+ xml_content=$(printf '
nameserver.info
@@ -144,7 +144,7 @@ dns_inwx_rm() {
- ' "$_domain" "$_sub_domain"
+ ' "$_domain" "$_sub_domain")
response="$(_post "$xml_content" "$INWX_Api" "" "POST")"
if ! printf "%s" "$response" | grep "Command completed successfully" >/dev/null; then
@@ -152,10 +152,10 @@ dns_inwx_rm() {
return 1
fi
- if ! printf "%s" "$response" | grep "count" -q; then
+ if ! printf "%s" "$response" | grep "count" >/dev/null; then
_info "Do not need to delete record"
else
- _record_id=$(printf '%s' "$response" | sed -nE 's/.*(record){1}(.*)(id<\/name>)([0-9]+){1}.*/\4/p')
+ _record_id=$(printf '%s' "$response" | _egrep_o '.*(record){1}(.*)([0-9]+){1}' | _egrep_o 'id<\/name>[0-9]+' | egrep -o '[0-9]+')
_info "Deleting record"
_inwx_delete_record "$_record_id"
fi
@@ -166,7 +166,7 @@ dns_inwx_rm() {
_inwx_login() {
- printf -v xml_content '
+ xml_content=$(printf '
account.login
@@ -189,7 +189,7 @@ _inwx_login() {
- ' $INWX_User $INWX_Password
+ ' $INWX_User $INWX_Password)
response="$(_post "$xml_content" "$INWX_Api" "" "POST")"
@@ -207,7 +207,7 @@ _get_root() {
_H1=$(_inwx_login)
export _H1
- printf -v xml_content '
+ xml_content='
nameserver.list
'
@@ -235,7 +235,7 @@ _get_root() {
_inwx_delete_record() {
record_id=$1
- printf -v xml_content '
+ xml_content=$(printf '
nameserver.deleteRecord
@@ -252,7 +252,7 @@ _inwx_delete_record() {
- ' "$record_id"
+ ' "$record_id")
response="$(_post "$xml_content" "$INWX_Api" "" "POST")"
@@ -267,7 +267,7 @@ _inwx_delete_record() {
_inwx_update_record() {
record_id=$1
txtval=$2
- printf -v xml_content '
+ xml_content=$(printf '
nameserver.updateRecord
@@ -290,7 +290,7 @@ _inwx_update_record() {
- ' "$txtval" "$record_id"
+ ' "$txtval" "$record_id")
response="$(_post "$xml_content" "$INWX_Api" "" "POST")"
@@ -308,7 +308,7 @@ _inwx_add_record() {
sub_domain=$2
txtval=$3
- printf -v xml_content '
+ xml_content=$(printf '
nameserver.createRecord
@@ -343,7 +343,7 @@ _inwx_add_record() {
- ' "$domain" "$txtval" "$sub_domain"
+ ' "$domain" "$txtval" "$sub_domain")
response="$(_post "$xml_content" "$INWX_Api" "" "POST")"