From f802fb7240a2972cb80fd128287368da93446a2b Mon Sep 17 00:00:00 2001 From: Andrew Ferguson Date: Tue, 10 Jun 2025 07:57:02 -0700 Subject: [PATCH] Fix formatting --- deploy/plex.sh | 4 +--- deploy/plex_synology.sh | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/deploy/plex.sh b/deploy/plex.sh index cd46597c..d1036468 100755 --- a/deploy/plex.sh +++ b/deploy/plex.sh @@ -37,7 +37,6 @@ plex_deploy() { #_DEPLOY_PLEX_WIKI="https://github.com/acmesh-official/acme.sh/wiki/deploy-to-plex" - _plex_to_pkcs() { # The existing _toPkcs command doesn't have an option to specify cipher, so copied here # to force using a modern cipher, as required by PMS: @@ -51,7 +50,6 @@ plex_deploy() { ${ACME_OPENSSL_BIN:-openssl} pkcs12 -export -out "$_cpfx" -certpbe AES-256-CBC -keypbe AES-256-CBC -macalg SHA256 -inkey "$_ckey" -in "$_ccert" -certfile "$_cca" -password "pass:$pfxPassword" } - if [ -z "$PLEX_PKCS12_password" ]; then _err "The PLEX_PKCS12_password variable is not defined. Plex requires a password for the certificate." #_err "See: $_DEPLOY_PLEX_WIKI" @@ -76,7 +74,7 @@ plex_deploy() { _debug "Generate import pkcs12" - if ! _plex_to_pkcs "$PLEX_PKCS12_file" "$_ckey" "$_ccert" "$_cca" "$PLEX_PKCS12_password"; then + if ! _plex_to_pkcs "$PLEX_PKCS12_file" "$_ckey" "$_ccert" "$_cca" "$PLEX_PKCS12_password"; then _err "Error generating pkcs12. Please re-run with --debug and report a bug." return 1 fi diff --git a/deploy/plex_synology.sh b/deploy/plex_synology.sh index 82ec3fbb..f98b084c 100644 --- a/deploy/plex_synology.sh +++ b/deploy/plex_synology.sh @@ -40,7 +40,6 @@ plex_synology_deploy() { #_DEPLOY_PLEX_WIKI="https://github.com/acmesh-official/acme.sh/wiki/deploy-to-plex" - _plex_to_pkcs() { # The existing _toPkcs command doesn't have an option to specify cipher, so copied here # to force using a modern cipher, as required by PMS: @@ -54,7 +53,6 @@ plex_synology_deploy() { ${ACME_OPENSSL_BIN:-openssl} pkcs12 -export -out "$_cpfx" -certpbe AES-256-CBC -keypbe AES-256-CBC -macalg SHA256 -inkey "$_ckey" -in "$_ccert" -certfile "$_cca" -password "pass:$pfxPassword" } - if [ -z "$PLEX_PKCS12_password" ]; then _err "The PLEX_PKCS12_password variable is not defined. Plex requires a password for the certificate." #_err "See: $_DEPLOY_PLEX_WIKI" @@ -79,7 +77,7 @@ plex_synology_deploy() { _debug "Generate import pkcs12" - if ! _plex_to_pkcs "$PLEX_PKCS12_file" "$_ckey" "$_ccert" "$_cca" "$PLEX_PKCS12_password"; then + if ! _plex_to_pkcs "$PLEX_PKCS12_file" "$_ckey" "$_ccert" "$_cca" "$PLEX_PKCS12_password"; then _err "Error generating pkcs12. Please re-run with --debug and report a bug." return 1 fi