Skip to content

Commit e6a6820

Browse files
committed
chore(cli): use singlequotes in all nushell source commands
1 parent 61c5794 commit e6a6820

5 files changed

Lines changed: 20 additions & 20 deletions

File tree

crates/vite_global_cli/src/commands/env/doctor.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ mod tests {
914914
std::fs::create_dir_all(&fake_home).unwrap();
915915
std::fs::create_dir_all(&fish_dir).unwrap();
916916

917-
std::fs::write(fish_dir.join("vite-plus.nu"), "source \"~/.vite-plus/env.nu\"\n").unwrap();
917+
std::fs::write(fish_dir.join("vite-plus.nu"), "source '~/.vite-plus/env.nu'\n").unwrap();
918918

919919
let _guard = ProfileEnvGuard::new(&fake_home, None, None, Some(&xdg_data));
920920

@@ -1006,11 +1006,8 @@ mod tests {
10061006
let nushell_autoload_dir = fake_home.join(nushell_autoload_path);
10071007
std::fs::create_dir_all(&nushell_autoload_dir).unwrap();
10081008

1009-
std::fs::write(
1010-
nushell_autoload_dir.join("vite-plus.nu"),
1011-
"source \"~/.vite-plus/env.nu\"\n",
1012-
)
1013-
.unwrap();
1009+
std::fs::write(nushell_autoload_dir.join("vite-plus.nu"), "source '~/.vite-plus/env.nu'\n")
1010+
.unwrap();
10141011

10151012
let _guard = ProfileEnvGuard::new(&fake_home, None, None, None);
10161013

crates/vite_global_cli/src/commands/env/setup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ fn print_path_instructions(bin_dir: &vite_path::AbsolutePath) {
737737
println!();
738738
println!(" For Nushell, add to ~/.config/nushell/config.nu:");
739739
println!();
740-
println!(" source \"{nu_home_path}/env.nu\"");
740+
println!(" source '{nu_home_path}/env.nu'");
741741
println!();
742742
println!(" For PowerShell, add to your $PROFILE:");
743743
println!();

crates/vite_global_cli/src/commands/implode.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,15 @@ fn spawn_deferred_delete(trash_path: &std::path::Path) -> std::io::Result<std::p
266266
/// Check if file content contains Vite+ sourcing lines.
267267
fn is_vite_plus_source_line(line: &str) -> bool {
268268
let trimmed = line.trim_start();
269-
(trimmed.starts_with(". ") || trimmed.starts_with("source "))
270-
&& ["env", "env.fish", "env.nu"].iter().any(|env_file| {
271-
trimmed.contains(&format!(".vite-plus/{env_file}\""))
272-
|| trimmed.contains(&format!(".vite-plus\\{env_file}\""))
273-
})
269+
[
270+
(". ", ".vite-plus/env\""),
271+
("source ", ".vite-plus/env\""),
272+
("source ", ".vite-plus/env.fish\""),
273+
("source ", ".vite-plus/env.nu'"),
274+
("source ", ".vite-plus\\env.nu'"),
275+
]
276+
.iter()
277+
.any(|(prefix, suffix)| trimmed.starts_with(prefix) && trimmed.contains(suffix))
274278
}
275279

276280
/// Remove Vite+ lines from content, returning the cleaned string.
@@ -369,14 +373,14 @@ mod tests {
369373

370374
#[test]
371375
fn test_remove_vite_plus_lines_nushell() {
372-
let content = "# existing config\n\n# Vite+ bin (https://viteplus.dev)\nsource \"~/.vite-plus/env.nu\"\n";
376+
let content = "# existing config\n\n# Vite+ bin (https://viteplus.dev)\nsource '~/.vite-plus/env.nu'\n";
373377
let result = remove_vite_plus_lines(content);
374378
assert_eq!(&*result, "# existing config\n");
375379
}
376380

377381
#[test]
378382
fn test_remove_vite_plus_lines_nushell_windows_path() {
379-
let content = "# existing config\nsource \"~\\.vite-plus\\env.nu\"\n";
383+
let content = "# existing config\nsource '~\\.vite-plus\\env.nu'\n";
380384
let result = remove_vite_plus_lines(content);
381385
assert_eq!(&*result, "# existing config\n");
382386
}
@@ -591,8 +595,7 @@ mod tests {
591595
std::fs::create_dir_all(&home).unwrap();
592596
std::fs::create_dir_all(&nushell_dir).unwrap();
593597

594-
std::fs::write(nushell_dir.join("vite-plus.nu"), "source \"~/.vite-plus/env.nu\"\n")
595-
.unwrap();
598+
std::fs::write(nushell_dir.join("vite-plus.nu"), "source '~/.vite-plus/env.nu'\n").unwrap();
596599

597600
let _guard = ProfileEnvGuard::new(None, None, Some(&xdg_data));
598601

packages/cli/install.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ function Configure-Nushell {
315315

316316
$autoloadFile = Join-Path $autoloadDir "vite-plus.nu"
317317
$nuEnvRef= (Join-Path $InstallDir "env.nu") -replace [regex]::Escape($env:USERPROFILE), '~'
318-
$content = "# Vite+ bin (https://viteplus.dev)`n" + ('source `'+ $nuEnvRef +'`') + "`n"
318+
$content = "# Vite+ bin (https://viteplus.dev)`n" + ("source '"+ $nuEnvRef +"'") + "`n"
319319

320320
try {
321321
New-Item -ItemType Directory -Force -Path $autoloadDir | Out-Null
@@ -690,7 +690,7 @@ exec "`$VP_HOME/current/bin/vp.exe" "`$@"
690690
if ($nushellResult.Status -eq "failed") {
691691
Write-Host " To use vp in Nushell, create a vite-plus.nu file in your preferred vendor autoload directory with:"
692692
Write-Host ""
693-
Write-Host " source `"$displayDir\env.nu`""
693+
Write-Host " source '$displayDir\env.nu'"
694694
Write-Host ""
695695
}
696696
Write-Host " Or run vp directly:"

packages/cli/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ configure_nushell_path() {
654654

655655
local nushell_autoload="$nushell_dir/vite-plus.nu"
656656
local nushell_content="# Vite+ bin (https://viteplus.dev)
657-
source \"$INSTALL_DIR_REF_NU/env.nu\"
657+
source '$INSTALL_DIR_REF_NU/env.nu'
658658
"
659659

660660
local result=0
@@ -1047,7 +1047,7 @@ WRAPPER_EOF
10471047
echo " - Fish: create ${XDG_CONFIG_HOME:-$HOME/.config}/fish/conf.d/vite-plus.fish with:"
10481048
echo " source \"$INSTALL_DIR_REF_POSIX/env.fish\""
10491049
echo " - Nushell: create a vendor autoload file with:"
1050-
echo " source \"$INSTALL_DIR_REF_NU/env.nu\""
1050+
echo " source '$INSTALL_DIR_REF_NU/env.nu'"
10511051
echo ""
10521052
echo " Or run vp directly:"
10531053
echo ""

0 commit comments

Comments
 (0)