From 85cb43b27266177c260dc1b1630a942ca24699ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Gaud=C3=A9?= Date: Tue, 28 Feb 2023 15:04:41 +0100 Subject: [PATCH 1/2] Fixe erreur script sous manjaro --- resources/com/cadoles/common/add-letsencrypt-ca.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/com/cadoles/common/add-letsencrypt-ca.sh b/resources/com/cadoles/common/add-letsencrypt-ca.sh index 1e8d2fe..efda172 100644 --- a/resources/com/cadoles/common/add-letsencrypt-ca.sh +++ b/resources/com/cadoles/common/add-letsencrypt-ca.sh @@ -4,7 +4,7 @@ set -eo pipefail DESTDIR=/usr/local/share/ca-certificates if [ ! -d "$DESTDIR" ]; then - DESTDIR=/etc/pki/ca-trust/source/anchors + DESTDIR=/etc/ca-certificates/trust-source/anchors fi UPDATE_CERTS_CMD=update-ca-certificates -- 2.17.1 From 2fbe2ab0b0fbb682379ae8b2168aee3702cf7ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Gaud=C3=A9?= Date: Wed, 1 Mar 2023 10:10:55 +0100 Subject: [PATCH 2/2] Gestion des chemins de destination via un tableau --- .../com/cadoles/common/add-letsencrypt-ca.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) mode change 100644 => 100755 resources/com/cadoles/common/add-letsencrypt-ca.sh diff --git a/resources/com/cadoles/common/add-letsencrypt-ca.sh b/resources/com/cadoles/common/add-letsencrypt-ca.sh old mode 100644 new mode 100755 index efda172..b71fb54 --- a/resources/com/cadoles/common/add-letsencrypt-ca.sh +++ b/resources/com/cadoles/common/add-letsencrypt-ca.sh @@ -2,10 +2,18 @@ set -eo pipefail -DESTDIR=/usr/local/share/ca-certificates -if [ ! -d "$DESTDIR" ]; then - DESTDIR=/etc/ca-certificates/trust-source/anchors -fi +declare -a DESTDIR_PATHS=( + "/usr/local/share/ca-certificates" + "/etc/ca-certificates/trust-source/anchors" + "/etc/pki/ca-trust/source/anchors" +) + +for path in "${DESTDIR_PATHS[@]}"; do + if [ -d "$path" ]; then + DESTDIR=$path + break + fi +done UPDATE_CERTS_CMD=update-ca-certificates if [ -z "$(which $UPDATE_CERTS_CMD)" ]; then -- 2.17.1