From 81b458d59c0db95afafae2e7bd2bd4414b3d99e7 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Sun, 8 Feb 2026 12:10:53 +0100 Subject: [PATCH] Run shellcheck --- hosts/bekkalokk/services/website/fetch-gallery.nix | 8 ++++---- hosts/bicep/services/mysql/backup.nix | 2 +- hosts/bicep/services/postgresql/backup.nix | 2 +- .../services/gitea/customization/default.nix | 14 +++++++------- modules/matrix-ooye.nix | 4 ++-- modules/snakeoil-certs.nix | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hosts/bekkalokk/services/website/fetch-gallery.nix b/hosts/bekkalokk/services/website/fetch-gallery.nix index 236bd41..508fc20 100644 --- a/hosts/bekkalokk/services/website/fetch-gallery.nix +++ b/hosts/bekkalokk/services/website/fetch-gallery.nix @@ -47,8 +47,8 @@ in { }} # Delete files and directories that exists in the gallery that don't exist in the tarball - filesToRemove=$(uniq -u <(sort <(find . -not -path "./.thumbnails*") <(tar -tf ${transferDir}/gallery.tar.gz | sed 's|/$||'))) - while IFS= read fname; do + filesToRemove=$(uniq -u <(sort <(find . -not -path "./.thumbnails*") <(tar -tf "${transferDir}/gallery.tar.gz" | sed 's|/$||'))) + while IFS= read -r fname; do rm -f "$fname" ||: rm -f ".thumbnails/$fname.png" ||: done <<< "$filesToRemove" @@ -58,7 +58,7 @@ in { mkdir -p .thumbnails images=$(find . -type f -not -path "./.thumbnails*") - while IFS= read fname; do + while IFS= read -r fname; do # Skip this file if an up-to-date thumbnail already exists if [ -f ".thumbnails/$fname.png" ] && \ [ "$(date -R -r "$fname")" == "$(date -R -r ".thumbnails/$fname.png")" ] @@ -67,7 +67,7 @@ in { fi echo "Creating thumbnail for $fname" - mkdir -p $(dirname ".thumbnails/$fname") + mkdir -p "$(dirname ".thumbnails/$fname")" magick -define jpeg:size=200x200 "$fname" -thumbnail 300 -auto-orient ".thumbnails/$fname.png" ||: touch -m -d "$(date -R -r "$fname")" ".thumbnails/$fname.png" done <<< "$images" diff --git a/hosts/bicep/services/mysql/backup.nix b/hosts/bicep/services/mysql/backup.nix index 2936a2a..0169eb4 100644 --- a/hosts/bicep/services/mysql/backup.nix +++ b/hosts/bicep/services/mysql/backup.nix @@ -57,7 +57,7 @@ in rm "$STATE_DIRECTORY/mysql-dump-latest.sql.zst" ||: ln -T "$OUT_FILE" "$STATE_DIRECTORY/mysql-dump-latest.sql.zst" - while [ "$(find "$STATE_DIRECTORY" -type f -printf '.' | wc -c)" -gt ${toString (rotations + 1)} ]; do + while [ "$(find "$STATE_DIRECTORY" -type f -printf '.' | wc -c)" -gt "${toString (rotations + 1)}" ]; do rm "$(find "$STATE_DIRECTORY" -type f -printf '%T+ %p\n' | sort | head -n 1 | cut -d' ' -f2)" done ''; diff --git a/hosts/bicep/services/postgresql/backup.nix b/hosts/bicep/services/postgresql/backup.nix index ebb508a..290ee47 100644 --- a/hosts/bicep/services/postgresql/backup.nix +++ b/hosts/bicep/services/postgresql/backup.nix @@ -58,7 +58,7 @@ in rm "$STATE_DIRECTORY/postgresql-dump-latest.sql.zst" ||: ln -T "$OUT_FILE" "$STATE_DIRECTORY/postgresql-dump-latest.sql.zst" - while [ "$(find "$STATE_DIRECTORY" -type f -printf '.' | wc -c)" -gt ${toString (rotations + 1)} ]; do + while [ "$(find "$STATE_DIRECTORY" -type f -printf '.' | wc -c)" -gt "${toString (rotations + 1)}" ]; do rm "$(find "$STATE_DIRECTORY" -type f -printf '%T+ %p\n' | sort | head -n 1 | cut -d' ' -f2)" done ''; diff --git a/hosts/kommode/services/gitea/customization/default.nix b/hosts/kommode/services/gitea/customization/default.nix index fa19d2e..327f29d 100644 --- a/hosts/kommode/services/gitea/customization/default.nix +++ b/hosts/kommode/services/gitea/customization/default.nix @@ -50,14 +50,14 @@ in sed -i -e 's/24/60/g' "$out/repo/icon.tmpl" ''; in '' - install -Dm444 ${logo-svg} ${cfg.customDir}/public/assets/img/logo.svg - install -Dm444 ${logo-png} ${cfg.customDir}/public/assets/img/logo.png - install -Dm444 ${./loading.apng} ${cfg.customDir}/public/assets/img/loading.png - install -Dm444 ${extraLinks} ${cfg.customDir}/templates/custom/extra_links.tmpl - install -Dm444 ${extraLinksFooter} ${cfg.customDir}/templates/custom/extra_links_footer.tmpl - install -Dm444 ${project-labels} ${cfg.customDir}/options/label/project-labels.yaml + install -Dm444 ${logo-svg} "${cfg.customDir}/public/assets/img/logo.svg" + install -Dm444 ${logo-png} "${cfg.customDir}/public/assets/img/logo.png" + install -Dm444 ${./loading.apng} "${cfg.customDir}/public/assets/img/loading.png" + install -Dm444 ${extraLinks} "${cfg.customDir}/templates/custom/extra_links.tmpl" + install -Dm444 ${extraLinksFooter} "${cfg.customDir}/templates/custom/extra_links_footer.tmpl" + install -Dm444 ${project-labels} "${cfg.customDir}/options/label/project-labels.yaml" - "${lib.getExe pkgs.rsync}" -a "${customTemplates}/" ${cfg.customDir}/templates/ + "${lib.getExe pkgs.rsync}" -a "${customTemplates}/" "${cfg.customDir}/templates/" ''; }; } diff --git a/modules/matrix-ooye.nix b/modules/matrix-ooye.nix index 071e8f6..6fd8ff5 100644 --- a/modules/matrix-ooye.nix +++ b/modules/matrix-ooye.nix @@ -81,7 +81,7 @@ in if [[ ! -f ''${REGISTRATION_FILE} ]]; then echo "No registration file found at '$REGISTRATION_FILE'" - cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE} + cp --no-preserve=mode,ownership "${baseConfig}" ''${REGISTRATION_FILE} fi echo "After if statement" @@ -116,7 +116,7 @@ in fi shred -u ''${REGISTRATION_FILE} - cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE} + cp --no-preserve=mode,ownership "${baseConfig}" ''${REGISTRATION_FILE} ${lib.getExe pkgs.jq} '.as_token = "'$AS_TOKEN'" | .hs_token = "'$HS_TOKEN'" | .ooye.discord_token = "'$DISCORD_TOKEN'" | .ooye.discord_client_secret = "'$DISCORD_CLIENT_SECRET'"' ''${REGISTRATION_FILE} > ''${REGISTRATION_FILE}.tmp diff --git a/modules/snakeoil-certs.nix b/modules/snakeoil-certs.nix index 61f086a..bbae70b 100644 --- a/modules/snakeoil-certs.nix +++ b/modules/snakeoil-certs.nix @@ -51,8 +51,8 @@ in script = let openssl = lib.getExe pkgs.openssl; in lib.concatMapStringsSep "\n" ({ name, value }: '' - mkdir -p $(dirname "${value.certificate}") $(dirname "${value.certificateKey}") - if ! ${openssl} x509 -checkend 86400 -noout -in ${value.certificate} + mkdir -p "$(dirname "${value.certificate}")" "$(dirname "${value.certificateKey}")" + if ! ${openssl} x509 -checkend 86400 -noout -in "${value.certificate}" then echo "Regenerating '${value.certificate}'" ${openssl} req \