Browse Source

Remove -q from greps

pull/2369/head
Brian Hartvigsen 5 years ago
parent
commit
1b475cf9f3
No known key found for this signature in database GPG Key ID: 46EEA32081255BEB
  1. 6
      deploy/synology_dsm.sh

6
deploy/synology_dsm.sh

@ -116,7 +116,7 @@ synology_dsm_deploy() {
_savedeployconf SYNO_Certificate "$SYNO_Certificate" _savedeployconf SYNO_Certificate "$SYNO_Certificate"
default=false default=false
if echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\([^{]*\).*/\1/p" | grep -q -- 'is_default":true'; then
if echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\([^{]*\).*/\1/p" | grep -- 'is_default":true' >/dev/null; then
default=true default=true
fi fi
_debug2 default "$default" _debug2 default "$default"
@ -138,8 +138,8 @@ synology_dsm_deploy() {
response=$(_post "$content" "$_base_url/webapi/entry.cgi?api=SYNO.Core.Certificate&method=import&version=1&SynoToken=$token" "" "POST" "multipart/form-data; boundary=${delim}") response=$(_post "$content" "$_base_url/webapi/entry.cgi?api=SYNO.Core.Certificate&method=import&version=1&SynoToken=$token" "" "POST" "multipart/form-data; boundary=${delim}")
_debug3 response "$response" _debug3 response "$response"
if ! echo "$response" | grep -q '"error":'; then
if echo "$response" | grep -q '"restart_httpd":true'; then
if ! echo "$response" | grep '"error":' >/dev/null; then
if echo "$response" | grep '"restart_httpd":true' >/dev/null; then
_info "http services were restarted" _info "http services were restarted"
else else
_info "http services were NOT restarted" _info "http services were NOT restarted"

Loading…
Cancel
Save