No more symlinks on Windows

Cargo.toml

@@ -16,6 +16,10 @@ smoke-tests = []
 name = "volta-shim"
 path = "src/volta-shim.rs"
 
+[[bin]]
+name = "volta-runner"
+path = "src/volta-runner.rs"
+
 [[bin]]
 name = "volta-migrate"
 path = "src/volta-migrate.rs"

crates/volta-core/Cargo.toml

@@ -47,10 +47,12 @@ dunce = "1.0.4"
 ci_info = "0.14.14"
 headers = "0.4"
 attohttpc = { version = "0.28", default-features = false, features = ["json", "compress", "tls-rustls-native-roots"] }
+hyperx = "1.4.0"
 chain-map = "0.1.0"
 indexmap = "2.2.6"
 retry = "2"
 fs2 = "0.4.3"
 
 [target.'cfg(windows)'.dependencies]
 winreg = "0.52.0"
+junction = "1.0.0"

crates/volta-core/src/fs.rs

@@ -118,27 +118,14 @@ pub fn create_staging_dir() -> Fallible<TempDir> {
     })
 }
 
-/// Create a file symlink. The `dst` path will be a symbolic link pointing to the `src` path.
-pub fn symlink_file<S, D>(src: S, dest: D) -> io::Result<()>
-where
-    S: AsRef<Path>,
-    D: AsRef<Path>,
-{
-    #[cfg(windows)]
-    return std::os::windows::fs::symlink_file(src, dest);
-
-    #[cfg(unix)]
-    return std::os::unix::fs::symlink(src, dest);
-}
-
 /// Create a directory symlink. The `dst` path will be a symbolic link pointing to the `src` path
 pub fn symlink_dir<S, D>(src: S, dest: D) -> io::Result<()>
 where
     S: AsRef<Path>,
     D: AsRef<Path>,
 {
     #[cfg(windows)]
-    return std::os::windows::fs::symlink_dir(src, dest);
+    return junction::create(src, dest);
 
     #[cfg(unix)]
     return std::os::unix::fs::symlink(src, dest);

crates/volta-core/src/run/mod.rs

@@ -104,6 +104,8 @@ fn get_executor(
 
 /// Determine the name of the command to run by inspecting the first argument to the active process
 fn get_tool_name(args: &mut ArgsOs) -> Fallible<OsString> {
+    args.next();
+
     args.next()
         .and_then(|arg0| Path::new(&arg0).file_name().map(tool_name_from_file_name))
         .ok_or_else(|| ErrorKind::CouldNotDetermineTool.into())

crates/volta-core/src/shim.rs

@@ -6,7 +6,7 @@ use std::io;
 use std::path::Path;
 
 use crate::error::{Context, ErrorKind, Fallible, VoltaError};
-use crate::fs::{read_dir_eager, symlink_file};
+use crate::fs::read_dir_eager;
 use crate::layout::{volta_home, volta_install};
 use crate::sync::VoltaLock;
 use log::debug;
@@ -71,10 +71,19 @@ pub fn create(shim_name: &str) -> Fallible<ShimResult> {
     let executable = volta_install()?.shim_executable();
     let shim = volta_home()?.shim_file(shim_name);
 
+    let shim_result;
     #[cfg(windows)]
-    windows::create_git_bash_script(shim_name)?;
+    {
+        windows::create_git_bash_script(shim_name)?;
+        shim_result = std::fs::copy(executable, shim);
+    }
+
+    #[cfg(unix)]
+    {
+        shim_result = std::os::unix::fs::symlink(executable, shim);
+    }
 
-    match symlink_file(executable, shim) {
+    match shim_result {
         Ok(_) => Ok(ShimResult::Created),
         Err(err) => {
             if err.kind() == io::ErrorKind::AlreadyExists {

src/volta-runner.rs

@@ -0,0 +1,35 @@
+mod common;
+
+use common::{ensure_layout, Error, IntoResult};
+use volta_core::error::{report_error, ExitCode};
+use volta_core::log::{LogContext, LogVerbosity, Logger};
+use volta_core::run::execute_shim;
+use volta_core::session::{ActivityKind, Session};
+use volta_core::signal::setup_signal_handler;
+
+pub fn main() {
+    Logger::init(LogContext::Shim, LogVerbosity::Default)
+        .expect("Only a single Logger should be initialized");
+    setup_signal_handler();
+
+    let mut session = Session::init();
+    session.add_event_start(ActivityKind::Tool);
+
+    let result = ensure_layout().and_then(|()| execute_shim(&mut session).into_result());
+    match result {
+        Ok(()) => {
+            session.add_event_end(ActivityKind::Tool, ExitCode::Success);
+            session.exit(ExitCode::Success);
+        }
+        Err(Error::Tool(code)) => {
+            session.add_event_tool_end(ActivityKind::Tool, code);
+            session.exit_tool(code);
+        }
+        Err(Error::Volta(err)) => {
+            report_error(env!("CARGO_PKG_VERSION"), &err);
+            session.add_event_error(ActivityKind::Tool, &err);
+            session.add_event_end(ActivityKind::Tool, err.exit_code());
+            session.exit(ExitCode::ExecutionFailure);
+        }
+    }
+}

src/volta-shim.rs

@@ -1,35 +1,12 @@
-mod common;
+use std::process::{Command, ExitCode};
 
-use common::{ensure_layout, Error, IntoResult};
-use volta_core::error::{report_error, ExitCode};
-use volta_core::log::{LogContext, LogVerbosity, Logger};
-use volta_core::run::execute_shim;
-use volta_core::session::{ActivityKind, Session};
-use volta_core::signal::setup_signal_handler;
-
-pub fn main() {
-    Logger::init(LogContext::Shim, LogVerbosity::Default)
-        .expect("Only a single Logger should be initialized");
-    setup_signal_handler();
-
-    let mut session = Session::init();
-    session.add_event_start(ActivityKind::Tool);
-
-    let result = ensure_layout().and_then(|()| execute_shim(&mut session).into_result());
+pub fn main() -> ExitCode {
+    let result = Command::new("volta-runner").args(std::env::args()).status();
     match result {
-        Ok(()) => {
-            session.add_event_end(ActivityKind::Tool, ExitCode::Success);
-            session.exit(ExitCode::Success);
-        }
-        Err(Error::Tool(code)) => {
-            session.add_event_tool_end(ActivityKind::Tool, code);
-            session.exit_tool(code);
-        }
-        Err(Error::Volta(err)) => {
-            report_error(env!("CARGO_PKG_VERSION"), &err);
-            session.add_event_error(ActivityKind::Tool, &err);
-            session.add_event_end(ActivityKind::Tool, err.exit_code());
-            session.exit(ExitCode::ExecutionFailure);
-        }
+        Ok(exit_status) => match exit_status.code() {
+            None => ExitCode::FAILURE,
+            Some(code) => ExitCode::from(code as u8),
+        },
+        Err(_) => ExitCode::FAILURE,
     }
 }

tests/acceptance/support/sandbox.rs

@@ -10,7 +10,7 @@ use headers::{Expires, Header};
 use mockito::{self, mock, Matcher};
 use node_semver::Version;
 use test_support::{self, ok_or_panic, paths, paths::PathExt, process::ProcessBuilder};
-use volta_core::fs::{set_executable, symlink_file};
+use volta_core::fs::set_executable;
 use volta_core::tool::{Node, Pnpm, Yarn, NODE_DISTRO_ARCH, NODE_DISTRO_EXTENSION, NODE_DISTRO_OS};
 
 // version cache for node and yarn
@@ -135,7 +135,9 @@ impl ShimBuilder {
     }
 
     fn build(&self) {
-        ok_or_panic! { symlink_file(shim_exe(), shim_file(&self.name)) };
+        ok_or_panic! {
+            std::os::unix::fs::symlink(shim_exe(), shim_file(&self.name))
+        }
     }
 }