diff --git a/scripts/install.sh b/scripts/install.sh
index a5302e0..dc57e6e 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-# shellcheck source=deploy-manifest.sh
+# shellcheck source=scripts/deploy-manifest.sh
 source "$REPO_ROOT/scripts/deploy-manifest.sh"
 
 # Collect provider skill adapters from all provider-manifest.sh files
@@ -39,7 +39,7 @@ skills_dest="$HOME/$DEPLOY_SKILLS_SRC"
 mkdir -p "$skills_dest"
 for skill_dir in "$REPO_ROOT/$DEPLOY_SKILLS_SRC"/*/; do
   skill_name="$(basename "$skill_dir")"
-  rm -rf "$skills_dest/$skill_name"
+  rm -rf "${skills_dest:?}/${skill_name:?}"
   cp -r "$skill_dir" "$skills_dest/$skill_name"
 done
 
diff --git a/scripts/setup-hooks.sh b/scripts/setup-hooks.sh
index 2bdd258..f236a05 100755
--- a/scripts/setup-hooks.sh
+++ b/scripts/setup-hooks.sh
@@ -147,7 +147,7 @@ staged=$(git diff --cached --name-only --diff-filter=ACM)
 # shellcheck on staged .sh files
 if command -v shellcheck &>/dev/null; then
   while IFS= read -r f; do
-    [[ -f "$f" ]] && shellcheck "$f"
+    [[ -f "$f" ]] && shellcheck -x "$f"
   done < <(echo "$staged" | grep '\.sh$' || true)
 else
   echo "Warning: shellcheck not installed — shell script linting skipped" >&2