Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
d07172a5
Unverified
Commit
d07172a5
authored
Feb 09, 2020
by
Brian Hartvigsen
Browse files
Replace disabled linter with variable substituion
parent
79637097
Changes
1
Hide whitespace changes
Inline
Side-by-side
deploy/synology_dsm.sh
View file @
d07172a5
...
@@ -68,8 +68,7 @@ synology_dsm_deploy() {
...
@@ -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() {
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment