Fix shellcheck issues

This commit is contained in:
Brian Hartvigsen 2020-05-16 00:19:18 -06:00
parent 668967a719
commit 3a7c7fe4e8
No known key found for this signature in database
GPG Key ID: 46EEA32081255BEB

View File

@ -40,9 +40,7 @@ synology_dsm_deploy() {
_getdeployconf SYNO_Password _getdeployconf SYNO_Password
_getdeployconf SYNO_Create _getdeployconf SYNO_Create
_getdeployconf SYNO_DID _getdeployconf SYNO_DID
if [ -z "$SYNO_Username" ] || [ -z "$SYNO_Password" ]; then if [ -z "${SYNO_Username:-}" ] || [ -z "${SYNO_Password:-}" ]; then
SYNO_Username=""
SYNO_Password=""
_err "SYNO_Username & SYNO_Password must be set" _err "SYNO_Username & SYNO_Password must be set"
return 1 return 1
fi fi
@ -70,7 +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
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
@ -113,7 +111,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"
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