Skip to content

direnvrc: avoid errors where possible #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 8, 2023
Merged

direnvrc: avoid errors where possible #465

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
910271f
direnvrc: avoid exiting with code 1
bobvanderlinden Mar 7, 2023
555f210
direnvrc: use log_error for errors
bobvanderlinden Mar 7, 2023
95f329d
direnvrc: avoid exit 1 when parsing devenv.yaml fails
bobvanderlinden Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions direnvrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ _nix_direnv_preflight () {
if [[ -z ${DEVENV_BIN:-} ]]; then
DEVENV_BIN=$(command -v devenv)
if [[ -z "${DEVENV_BIN}" ]]; then
log_status "command not found: devenv, see https://devenv.sh/getting-started/"
log_error "command not found: devenv, see https://devenv.sh/getting-started/"
exit 1
fi
fi

if ! has direnv_version || ! direnv_version "$REQUIRED_DIRENV_VERSION" 2>/dev/null; then
log_status "base direnv version is older than the required v$REQUIRED_DIRENV_VERSION."
log_error "base direnv version is older than the required v$REQUIRED_DIRENV_VERSION."
exit 1
fi

Expand Down Expand Up @@ -111,8 +111,8 @@ use_devenv() {
files_to_watch+=("$flake_dir/devenv.nix" "$flake_dir/devenv.lock" "$flake_dir/devenv.yaml" "$flake_dir/devenv.local.nix")
if [[ -f "$flake_dir/devenv.yaml" ]]; then
if ! devenv assemble; then
log_status "$(devenv version) failed to parse devenv.yaml, make sure to use version 0.6 or newer and fix the errors above."
exit 1
log_error "$(devenv version) failed to parse devenv.yaml, make sure to use version 0.6 or newer and fix the errors above."
exit 0
fi

if [[ -f "$flake_dir/.devenv/imports.txt" ]]; then
Expand Down Expand Up @@ -143,15 +143,14 @@ use_devenv() {
then
# We need to update our cache
local env
env=$("${DEVENV_BIN}" print-dev-env)
if [[ "$env" == *"DEVENV_ROOT"* ]]; then
echo "$env" > "$profile_rc"
log_status "updated devenv shell cache"
_nix_import_env "$profile_rc"
else
log_status "loading the environment failed"
exit 1
if ! env=$("${DEVENV_BIN}" print-dev-env); then
log_error "failed to build the devenv environment. devenv.nix may contain errors. see above."
exit 0
fi

echo "$env" > "$profile_rc"
log_status "updated devenv shell cache"
_nix_import_env "$profile_rc"
else
log_status "using cached devenv shell"
_nix_import_env "$profile_rc"
Expand Down