Browse Source
Replace disabled linter with variable substituion
pull/2369/head
Brian Hartvigsen
5 years ago
No known key found for this signature in database
GPG Key ID: 46EEA32081255BEB
1 changed files with
2 additions and
4 deletions
-
deploy/synology_dsm.sh
|
|
@ -68,8 +68,7 @@ synology_dsm_deploy() { |
|
|
|
|
|
|
|
|
# Get the certificate description, but don't save it until we verfiy it's real |
|
|
# Get the certificate description, but don't save it until we verfiy it's real |
|
|
_getdeployconf SYNO_Certificate |
|
|
_getdeployconf SYNO_Certificate |
|
|
# shellcheck disable=SC2154 |
|
|
|
|
|
if [ -z "${SYNO_Certificate}" ]; then |
|
|
|
|
|
|
|
|
if [ -z "${SYNO_Certificate:?}" ]; then |
|
|
_err "SYNO_Certificate needs to be defined (with the Certificate description name)" |
|
|
_err "SYNO_Certificate needs to be defined (with the Certificate description name)" |
|
|
return 1 |
|
|
return 1 |
|
|
fi |
|
|
fi |
|
|
@ -108,8 +107,7 @@ synology_dsm_deploy() { |
|
|
id=$(echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\"id\":\"\([^\"]*\).*/\1/p") |
|
|
id=$(echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\"id\":\"\([^\"]*\).*/\1/p") |
|
|
_debug2 id "$id" |
|
|
_debug2 id "$id" |
|
|
|
|
|
|
|
|
# shellcheck disable=SC2154 |
|
|
|
|
|
if [ -z "$id" ] && [ -z "$SYNO_Create" ]; then |
|
|
|
|
|
|
|
|
if [ -z "$id" ] && [ -z "${SYNO_Create:?}" ]; then |
|
|
_err "Unable to find certificate: $SYNO_Certificate and \$SYNO_Create is not set" |
|
|
_err "Unable to find certificate: $SYNO_Certificate and \$SYNO_Create is not set" |
|
|
return 1 |
|
|
return 1 |
|
|
fi |
|
|
fi |
|
|
|
