Skip to content

Commit

Permalink
source ~/.jq file on windows (fix jqlang#3104)
Browse files Browse the repository at this point in the history
  • Loading branch information
kirkoman committed May 7, 2024
1 parent 6ce6e7c commit 01f7360
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/content/manual/manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3662,7 +3662,7 @@ sections:
For example, with `-L$HOME/.jq` a module `foo` can be found in
`$HOME/.jq/foo.jq` and `$HOME/.jq/foo/foo.jq`.
If `$HOME/.jq` is a file, it is sourced into the main program.
If `~/.jq` is a file, it is sourced into the main program.
entries:
- title: "`import RelativePathString as NAME [<metadata>];`"
Expand Down
2 changes: 1 addition & 1 deletion jq.1.prebuilt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/linker.c
Original file line number Diff line number Diff line change
Expand Up @@ -420,13 +420,13 @@ int load_program(jq_state *jq, struct locfile* src, block *out_block) {
return 1;
}

char* home = getenv("HOME");
if (home) { // silently ignore no $HOME
/* Import ~/.jq as a library named "" found in $HOME */
jv home = get_home();
if (jv_is_valid(home)) { // silently ignore if home dir not determined
/* Import ~/.jq as a library named "" found in $HOME or %USERPROFILE% */
block import = gen_import_meta(gen_import("", NULL, 0),
gen_const(JV_OBJECT(
jv_string("optional"), jv_true(),
jv_string("search"), jv_string(home))));
jv_string("search"), home)));
program = BLOCK(import, program);
}

Expand Down

0 comments on commit 01f7360

Please sign in to comment.