As same as

kachick · Mar 17, 2024 · b4dd6d5 · b4dd6d5
1 parent 474b86c
commit b4dd6d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -146,7 +146,8 @@ jobs:
         run: |
           set -euxo pipefail
           container_id="$(podman run --detach --rm home:${{ needs.get-meta.outputs.started_at }})"
-          trap 'podman kill "$container_id"' EXIT ERR
+          # shellcheck disable=SC2064
+          trap "podman kill '$container_id'" EXIT ERR
           sleep 2 # Wait for the systemd to be ready
           podman exec --user=user "$container_id" cat /etc/nix/nix.conf
           podman exec --user=user --workdir='/home/user' -it "$container_id" '/home/user/.nix-profile/bin/zsh' -c 'la; lat ~/.config'

diff --git a/containers/build.bash b/containers/build.bash
@@ -5,7 +5,8 @@ set -euxo pipefail
 build() {
 	podman build --tag nix-systemd --file containers/Containerfile .
 	local -r container_id="$(podman run --detach --rm localhost/nix-systemd:latest)"
-	trap 'podman kill "$container_id"' EXIT ERR
+	# shellcheck disable=SC2064
+	trap "podman kill '$container_id'" EXIT ERR
 	sleep 1 # Wait for the systemd to be ready
 	podman exec --user=user -it "$container_id" /provisioner/needs_systemd.bash
 	podman exec --user=root -it "$container_id" rm -rf /provisioner

diff --git a/containers/sandbox.bash b/containers/sandbox.bash
@@ -4,7 +4,8 @@ set -euo pipefail
 
 sandbox() {
 	local -r container_id="$(podman run --detach --rm localhost/provisioned-systemd-home)"
-	trap 'podman kill "$container_id"' EXIT ERR
+	# shellcheck disable=SC2064
+	trap "podman kill '$container_id'" EXIT ERR
 	sleep 1 # Wait for the systemd to be ready
 	podman exec --user=user --workdir='/home/user' -it "$container_id" '/home/user/.nix-profile/bin/zsh'
 }