emacsPackages: use better SCRIPT_DIR detection in update scripts

NixOS · Nov 1, 2024 · 599ee53 · 599ee53
1 parent c7c5aae
commit 599ee53
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pkgs/applications/editors/emacs/elisp-packages/update b/pkgs/applications/editors/emacs/elisp-packages/update
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
-cd "$SCRIPT_DIR"
+# Classic "where I am" block
+# https://www.binaryphile.com/bash/2020/01/12/determining-the-location-of-your-script-in-bash.html
+SCRIPT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}); cd -P $(dirname $(readlink ${BASH_SOURCE[0]} || echo .)); pwd)
+cd "${SCRIPT_DIR}"
 
 ./update-from-overlay
 
 ./update-manual
-git commit -m "emacs.pkgs.manualPackages: $(date --iso)" -- .
+git commit -m "emacsPackages.manualPackages: updated at $(date --iso) (non-interactively)" -- .
diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-manual b/pkgs/applications/editors/emacs/elisp-packages/update-manual
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
-cd "$SCRIPT_DIR"
+# Classic "where I am" block
+# https://www.binaryphile.com/bash/2020/01/12/determining-the-location-of-your-script-in-bash.html
+SCRIPT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}); cd -P $(dirname $(readlink ${BASH_SOURCE[0]} || echo .)); pwd)
+cd "${SCRIPT_DIR}"
 
 nix-build --no-out-link update-manual.nix | xargs -n 1 -P $(nproc) bash -c