Bläddra i källkod

fix shellcheck warnings

neil 2 år sedan
förälder
incheckning
60315e5b91
6 ändrade filer med 10 tillägg och 10 borttagningar
  1. 1 1
      deploy/gitlab.sh
  2. 4 4
      dnsapi/dns_dynv6.sh
  3. 1 1
      dnsapi/dns_edgedns.sh
  4. 2 2
      dnsapi/dns_infomaniak.sh
  5. 1 1
      dnsapi/dns_servercow.sh
  6. 1 1
      dnsapi/dns_vultr.sh

+ 1 - 1
deploy/gitlab.sh

@@ -67,7 +67,7 @@ gitlab_deploy() {
 
 
   error_response="error"
   error_response="error"
 
 
-  if test "${_response#*$error_response}" != "$_response"; then
+  if test ${_response#*"$error_response"} != "$_response"; then
     _err "Error in deploying certificate:"
     _err "Error in deploying certificate:"
     _err "$_response"
     _err "$_response"
     return 1
     return 1

+ 4 - 4
dnsapi/dns_dynv6.sh

@@ -94,8 +94,8 @@ _get_domain() {
   _your_hosts="$(echo "$_your_hosts" | awk '/\./ {print $1}')"
   _your_hosts="$(echo "$_your_hosts" | awk '/\./ {print $1}')"
   for l in $_your_hosts; do
   for l in $_your_hosts; do
     #echo "host: $l"
     #echo "host: $l"
-    if test "${_full_domain#*$l}" != "$_full_domain"; then
-      _record="${_full_domain%.$l}"
+    if test ${_full_domain#*"$l"} != "$_full_domain"; then
+      _record=${_full_domain%."$l"}
       _host=$l
       _host=$l
       _debug "The host is $_host and the record $_record"
       _debug "The host is $_host and the record $_record"
       return 0
       return 0
@@ -143,7 +143,7 @@ _dns_dynv6_add_http() {
     return 1
     return 1
   fi
   fi
   _get_zone_name "$_zone_id"
   _get_zone_name "$_zone_id"
-  record="${fulldomain%%.$_zone_name}"
+  record=${fulldomain%%."$_zone_name"}
   _set_record TXT "$record" "$txtvalue"
   _set_record TXT "$record" "$txtvalue"
   if _contains "$response" "$txtvalue"; then
   if _contains "$response" "$txtvalue"; then
     _info "Successfully added record"
     _info "Successfully added record"
@@ -161,7 +161,7 @@ _dns_dynv6_rm_http() {
     return 1
     return 1
   fi
   fi
   _get_zone_name "$_zone_id"
   _get_zone_name "$_zone_id"
-  record="${fulldomain%%.$_zone_name}"
+  record=${fulldomain%%."$_zone_name"}
   _get_record_id "$_zone_id" "$record" "$txtvalue"
   _get_record_id "$_zone_id" "$record" "$txtvalue"
   _del_record "$_zone_id" "$_record_id"
   _del_record "$_zone_id" "$_record_id"
   if [ -z "$response" ]; then
   if [ -z "$response" ]; then

+ 1 - 1
dnsapi/dns_edgedns.sh

@@ -418,7 +418,7 @@ _edgedns_make_data_to_sign() {
   _secure_debug2 "hdr" "$hdr"
   _secure_debug2 "hdr" "$hdr"
   _edgedns_make_content_hash
   _edgedns_make_content_hash
   path="$(echo "$_request_url_path" | tr -d "\n\r" | sed 's/https\?:\/\///')"
   path="$(echo "$_request_url_path" | tr -d "\n\r" | sed 's/https\?:\/\///')"
-  path="${path#*$AKAMAI_HOST}"
+  path=${path#*"$AKAMAI_HOST"}
   _debug "hier path" "$path"
   _debug "hier path" "$path"
   # dont expose headers to sign so use MT string
   # dont expose headers to sign so use MT string
   _mdata="$(printf "%s\thttps\t%s\t%s\t%s\t%s\t%s" "$_request_method" "$AKAMAI_HOST" "$path" "" "$_hash" "$hdr")"
   _mdata="$(printf "%s\thttps\t%s\t%s\t%s\t%s\t%s" "$_request_method" "$AKAMAI_HOST" "$path" "" "$_hash" "$hdr")"

+ 2 - 2
dnsapi/dns_infomaniak.sh

@@ -76,7 +76,7 @@ dns_infomaniak_add() {
   domain_id=${zone_and_id#* }
   domain_id=${zone_and_id#* }
 
 
   # extract first part of domain
   # extract first part of domain
-  key=${fulldomain%.$zone}
+  key=${fulldomain%."$zone"}
 
 
   _debug "zone:$zone id:$domain_id key:$key"
   _debug "zone:$zone id:$domain_id key:$key"
 
 
@@ -149,7 +149,7 @@ dns_infomaniak_rm() {
   domain_id=${zone_and_id#* }
   domain_id=${zone_and_id#* }
 
 
   # extract first part of domain
   # extract first part of domain
-  key=${fulldomain%.$zone}
+  key=${fulldomain%."$zone"}
 
 
   _debug "zone:$zone id:$domain_id key:$key"
   _debug "zone:$zone id:$domain_id key:$key"
 
 

+ 1 - 1
dnsapi/dns_servercow.sh

@@ -53,7 +53,7 @@ dns_servercow_add() {
   if printf -- "%s" "$response" | grep "{\"name\":\"$_sub_domain\",\"ttl\":20,\"type\":\"TXT\"" >/dev/null; then
   if printf -- "%s" "$response" | grep "{\"name\":\"$_sub_domain\",\"ttl\":20,\"type\":\"TXT\"" >/dev/null; then
     _info "A txt record with the same name already exists."
     _info "A txt record with the same name already exists."
     # trim the string on the left
     # trim the string on the left
-    txtvalue_old=${response#*{\"name\":\"$_sub_domain\",\"ttl\":20,\"type\":\"TXT\",\"content\":\"}
+    txtvalue_old=${response#*{\"name\":\""$_sub_domain"\",\"ttl\":20,\"type\":\"TXT\",\"content\":\"}
     # trim the string on the right
     # trim the string on the right
     txtvalue_old=${txtvalue_old%%\"*}
     txtvalue_old=${txtvalue_old%%\"*}
 
 

+ 1 - 1
dnsapi/dns_vultr.sh

@@ -139,7 +139,7 @@ _vultr_rest() {
   data="$3"
   data="$3"
   _debug "$ep"
   _debug "$ep"
 
 
-  api_key_trimmed=$(echo $VULTR_API_KEY | tr -d '"')
+  api_key_trimmed=$(echo "$VULTR_API_KEY" | tr -d '"')
 
 
   export _H1="Authorization: Bearer $api_key_trimmed"
   export _H1="Authorization: Bearer $api_key_trimmed"
   export _H2='Content-Type: application/json'
   export _H2='Content-Type: application/json'