nix-community/nix-direnv
1
0
Fork 0
mirror of https://github.com/nix-community/nix-direnv.git synced 2025-11-08 19:46:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
mergify[bot] 2024-08-21 19:16:33 +00:00 • committed by GitHub
commit 5bbcef53fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
direnvrc
View file

@ -287,7 +287,7 @@ use_flake() {
if [[ $flake_expr == -* ]]; then if [[ $flake_expr == -* ]]; then
local message="the first argument must be a flake expression" local message="the first argument must be a flake expression"
if [[ -n $2 ]]; then if [[ -n ${2:-} ]]; then
_nix_direnv_error "$message" _nix_direnv_error "$message"
return 1 return 1
else else
@ -442,15 +442,15 @@ use_nix() {
# ignore them # ignore them
;; ;;
--include | -I) --include | -I)
extra_args+=("$i" "$1") extra_args+=("$i" "${1:-}")
shift shift
;; ;;
--attr | -A) --attr | -A)
attribute="$1" attribute="${1:-}"
shift shift
;; ;;
--option | -o | --arg | --argstr) --option | -o | --arg | --argstr)
extra_args+=("$i" "$1" "$2") extra_args+=("$i" "${1:-}" "${2:-}")
shift shift
shift shift
;; ;;