hooks/conf_regen: Fix some shellcheck

YunoHost · Dec 21, 2024 · df6dc90 · df6dc90
1 parent 3e90d35
commit df6dc90
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/hooks/conf_regen/30-opendkim b/hooks/conf_regen/30-opendkim
@@ -18,14 +18,15 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-set -e
+# Exit hook on subcommand error or unset variable
+set -Eeuo pipefail
 
 do_pre_regen() {
     pending_dir=$1
 
     cd /usr/share/yunohost/conf/opendkim
 
-    install -D -m 644 opendkim.conf "${pending_dir}/etc/opendkim.conf"
+    install -D -m 644 opendkim.conf "$pending_dir/etc/opendkim.conf"
 }
 
 do_post_regen() {
@@ -39,14 +40,14 @@ do_post_regen() {
     domain_list="$(yunohost domain list --features mail_in mail_out --output-as json | jq -r ".domains[]" | tr '\n' ' ')"
     for domain in $domain_list; do
         domain_key="/etc/dkim/${domain}.mail.key"
-        [ ! -f "$domain_key" ] && {
+        if [ ! -f "$domain_key" ]; then
             # We use a 1024 bit size because nsupdate doesn't seem to be able to
             # handle 2048...
             opendkim-genkey --domain="$domain" \
                 --selector=mail --directory=/etc/dkim -b 1024
             mv /etc/dkim/mail.private "$domain_key"
             mv /etc/dkim/mail.txt "/etc/dkim/${domain}.mail.txt"
-        }
+        fi
 
         echo "mail._domainkey.${domain} ${domain}:mail:${domain_key}" >> /etc/dkim/keytable
         echo "*@$domain mail._domainkey.${domain}" >> /etc/dkim/signingtable
@@ -58,4 +59,4 @@ do_post_regen() {
     systemctl restart opendkim
 }
 
-do_$1_regen ${@:2}
+"do_$1_regen" "${@:2}"
diff --git a/hooks/conf_regen/46-nsswitch b/hooks/conf_regen/46-nsswitch
@@ -18,7 +18,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-set -e
+# Exit hook on subcommand error or unset variable
+set -Eeuo pipefail
 
 do_init_regen() {
     do_pre_regen ""
@@ -30,14 +31,15 @@ do_pre_regen() {
 
     cd /usr/share/yunohost/conf/nsswitch
 
-    install -D -m 644 nsswitch.conf "${pending_dir}/etc/nsswitch.conf"
+    install -D -m 644 nsswitch.conf "$pending_dir/etc/nsswitch.conf"
 }
 
 do_post_regen() {
     regen_conf_files=$1
 
-    [[ -z "$regen_conf_files" ]] \
-        || systemctl restart unscd
+    if [[ -n "$regen_conf_files" ]]; then
+        systemctl restart unscd
+    fi
 }
 
-do_$1_regen ${@:2}
+"do_$1_regen" "${@:2}"