Merge branch 'master' into ambient-nix-with-fallback

nix-community · Aug 21, 2024 · 5bbcef5 · 5bbcef5
2 parents 94def84 + e29d46a
commit 5bbcef5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/direnvrc b/direnvrc
@@ -287,7 +287,7 @@ use_flake() {
 
   if [[ $flake_expr == -* ]]; then
     local message="the first argument must be a flake expression"
-    if [[ -n $2 ]]; then
+    if [[ -n ${2:-} ]]; then
       _nix_direnv_error "$message"
       return 1
     else
@@ -442,15 +442,15 @@ use_nix() {
       # ignore them
       ;;
     --include | -I)
-      extra_args+=("$i" "$1")
+      extra_args+=("$i" "${1:-}")
       shift
       ;;
     --attr | -A)
-      attribute="$1"
+      attribute="${1:-}"
       shift
       ;;
     --option | -o | --arg | --argstr)
-      extra_args+=("$i" "$1" "$2")
+      extra_args+=("$i" "${1:-}" "${2:-}")
       shift
       shift
       ;;