fix: actually run without symlinks

The old behavior seems to have been introduced inadvertently: https://github.com/fish-shell/fish-shell/pull/12636#issuecomment-4254328105 Closes #12636
lint: disable incorrect warning about unused fn
2026-04-18 22:21:15 -03:00 · 2026-04-16 15:10:15 +08:00 · 2026-04-16 15:10:15 +08:00 · 2026-04-16 15:10:15 +08:00 · 2026-04-16 15:10:14 +08:00 · 2026-04-16 15:10:14 +08:00
1 changed files with 15 additions and 8 deletions
--- a/build_tools/check.sh
+++ b/build_tools/check.sh
@@ -60,6 +60,7 @@ cargo() {
    fi
 }

+# shellcheck disable=2329
 cleanup () {
    if [ -n "$gettext_template_dir" ] && [ -e "$gettext_template_dir" ]; then
        rm -r "$gettext_template_dir"
@@ -89,6 +90,7 @@ fi

 gettext_template_dir=$(mktemp -d)
 (
+    # shellcheck disable=2030
    export FISH_GETTEXT_EXTRACTION_DIR="$gettext_template_dir"
    cargo build --workspace --all-targets --features=gettext-extract
 )
@@ -112,7 +114,8 @@ fi
 # - https://github.com/msys2/MSYS2-packages/issues/5784
 (
    if $is_cygwin; then
-        export PATH="$PATH:$(rustc --print target-libdir)"
+        PATH="$PATH:$(rustc --print target-libdir)"
+        export PATH
    fi
    cargo test --no-default-features --workspace --all-targets
 )
@@ -124,20 +127,24 @@ fi

 # Using "()" not "{}" because we do want a subshell (for the export)
 system_tests() (
-    [ -n "$@" ] && export "$@"
+    # shellcheck disable=2163
+    [ -n "$*" ] && export "$@"
+    # shellcheck disable=2031
    export FISH_GETTEXT_EXTRACTION_DIR="$gettext_template_dir"
    "$workspace_root/tests/test_driver.py" "$build_dir"
 )

-test_cmd='FISH_GETTEXT_EXTRACTION_DIR="$gettext_template_dir" "$workspace_root/tests/test_driver.py" "$build_dir"'
 if $is_cygwin; then
-    echo -e "=== Running ${green}integration tests ${yellow}with${green} symlinks${reset}"
-    system_tests $cygwin_var=winsymlinks
+    # shellcheck disable=2059
+    printf "=== Running ${green}integration tests ${yellow}with${green} symlinks${reset}\n"
+    system_tests "$cygwin_var"=winsymlinks

-    echo -e "=== Running ${green}integration tests ${yellow}without${green} symlinks${reset}"
-    system_tests $cygwin_var=winsymlinks
+    # shellcheck disable=2059
+    printf "=== Running ${green}integration tests ${yellow}without${green} symlinks${reset}\n"
+    system_tests "$cygwin_var"=
 else
-    echo -e "=== Running ${green}integration tests${reset}"
+    # shellcheck disable=2059
+    printf "=== Running ${green}integration tests${reset}\n"
    system_tests
 fi
Author	SHA1	Message	Date
Daniel Rainer	3cb939c9a8	fix: actually run without symlinks The old behavior seems to have been introduced inadvertently: https://github.com/fish-shell/fish-shell/pull/12636#issuecomment-4254328105 Closes #12636	2026-04-16 15:10:15 +08:00
Daniel Rainer	4790a444d8	lint: disable incorrect warning about unused fn `cleanup` is used via `trap`. Part of #12636	2026-04-16 15:10:15 +08:00
Daniel Rainer	da924927a0	cleanup: split up assignment and export This prevents hiding failures of the `rustc` command. Part of #12636	2026-04-16 15:10:15 +08:00
Daniel Rainer	29ff2fdd43	lint: disable warning about variable export Here, we want `"$@"` to be expanded, since its components are the arguments we want to pass to `export`. Part of #12636	2026-04-16 15:10:14 +08:00
Daniel Rainer	732c04420b	lint: disable warnings about desired behavior We deliberately create subshells for the export in these cases, so we don't want warnings about it. Part of #12636	2026-04-16 15:10:14 +08:00
Daniel Rainer	947abd7464	cleanup: quote shell variables This is not a functional change, since the variable names don't have spaces, but it is more robust to changes and removes ShellCheck warnings Part of #12636	2026-04-16 15:10:14 +08:00
Daniel Rainer	12cfe59578	fix: don't use `echo -e` in POSIX shell The `-e` flag is not defined for `echo` in POSIX shell. Use `printf` instead. Part of #12636	2026-04-16 15:10:13 +08:00
Daniel Rainer	4b60d18b44	cleanup: remove unused variable Part of #12636	2026-04-16 15:10:13 +08:00
Daniel Rainer	dd8e59db03	fix: check if `system_tests` args are empty When `system_tests` is called without arguments, `[ -n "$@" ]` becomes `[ -n ]`, which is true, resulting in running `export`, which lists all exported variables, unnecessarily cluttering the output. If `system_tests` is called with more than one argument, the check would fail because having more than one argument after `-n` is invalid syntax. Fix this by using `$*`, which concatenates all positional arguments to `system_tests` into a single value. Part of #12636	2026-04-16 15:10:13 +08:00