Merge pull request #1035 from ghyatzo/patch-improveupdatechannel

Better messages when updating existing links

src/operations.rs

@@ -661,14 +661,16 @@ pub fn garbage_collect_versions(
  Ok(())
 }
 
-fn _remove_symlink(symlink_path: &Path) -> Result<()> {
+fn _remove_symlink(symlink_path: &Path) -> Result<Option<PathBuf>> {
  std::fs::create_dir_all(symlink_path.parent().unwrap())?;
 
  if symlink_path.exists() {
+ let prev_target = std::fs::read_link(&symlink_path)?;
  std::fs::remove_file(symlink_path)?;
+ return Ok(Some(prev_target));
  }
 
- Ok(())
+ Ok(None)
 }
 
 pub fn remove_symlink(symlink_name: &String) -> Result<()> {
@@ -698,20 +700,29 @@ pub fn create_symlink(
 
  let symlink_path = symlink_folder.join(symlink_name);
 
- _remove_symlink(&symlink_path)?;
+ let updating = _remove_symlink(&symlink_path)?;
 
  match channel {
  JuliaupConfigChannel::SystemChannel { version } => {
  let child_target_foldername = format!("julia-{}", version);
-
  let target_path = paths.juliauphome.join(&child_target_foldername);
 
- eprintln!(
- "{} {} for Julia {}.",
- style("Creating symlink").cyan().bold(),
- symlink_name,
- version
- );
+ if let Some(ref prev_target) = updating {
+ eprintln!(
+ "{} symlink {} ( {} -> {} )",
+ style("Updating").cyan().bold(),
+ symlink_name,
+ prev_target.to_string_lossy(),
+ version
+ );
+ } else {
+ eprintln!(
+ "{} {} for Julia {}.",
+ style("Creating symlink").cyan().bold(),
+ symlink_name,
+ version
+ );
+ }
 
  std::os::unix::fs::symlink(target_path.join("bin").join("julia"), &symlink_path)
  .with_context(|| {
@@ -730,12 +741,22 @@ pub fn create_symlink(
  } => {
  let target_path = paths.juliauphome.join(path);
 
- eprintln!(
- "{} {} for Julia {}.",
- style("Creating symlink").cyan().bold(),
- symlink_name,
- version
- );
+ if let Some(ref prev_target) = updating {
+ eprintln!(
+ "{} symlink {} ( {} -> {} )",
+ style("Updating").cyan().bold(),
+ symlink_name,
+ prev_target.to_string_lossy(),
+ version
+ );
+ } else {
+ eprintln!(
+ "{} {} for Julia {}.",
+ style("Creating symlink").cyan().bold(),
+ symlink_name,
+ version
+ );
+ }
 
  std::os::unix::fs::symlink(target_path.join("bin").join("julia"), &symlink_path)
  .with_context(|| {
@@ -751,12 +772,22 @@ pub fn create_symlink(
  None => command.clone(),
  };
 
- eprintln!(
- "{} {} for `{}`",
- style("Creating shim").cyan().bold(),
- symlink_name,
- formatted_command
- );
+ if let Some(ref prev_target) = updating {
+ eprintln!(
+ "{} shim {} ( {} -> {} )",
+ style("Updating").cyan().bold(),
+ symlink_name,
+ prev_target.to_string_lossy(),
+ formatted_command
+ );
+ } else {
+ eprintln!(
+ "{} {} for {}.",
+ style("Creating shim").cyan().bold(),
+ symlink_name,
+ formatted_command
+ );
+ }
 
  std::fs::write(
  &symlink_path,
@@ -785,12 +816,14 @@ pub fn create_symlink(
  }
  };
 
- if let Ok(path) = std::env::var("PATH") {
- if !path.split(':').any(|p| Path::new(p) == symlink_folder) {
- eprintln!(
+ if updating.is_none() {
+ if let Ok(path) = std::env::var("PATH") {
+ if !path.split(':').any(|p| Path::new(p) == symlink_folder) {
+ eprintln!(
  "Symlink {} added in {}. Add this directory to the system PATH to make the command available in your shell.",
  &symlink_name, symlink_folder.display(),
  );
+ }
  }
  }