Merge pull request #25 from ink0rr/dev

rgl v0.10.1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rgl"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 
 [[bin]]

src/fs.rs

@@ -118,19 +118,19 @@ pub fn set_modified_time(path: impl AsRef<Path>, time: SystemTime) -> Result<()>
 #[cfg(unix)]
 fn symlink_impl(from: &Path, to: &Path) -> io::Result<()> {
     use std::os::unix;
-    unix::fs::symlink(from, to)
+    unix::fs::symlink(canonicalize(from)?, to)
 }
 
 #[cfg(windows)]
 fn symlink_impl(from: &Path, to: &Path) -> io::Result<()> {
     use std::os::windows;
-    windows::fs::symlink_dir(from, to)
+    windows::fs::symlink_dir(canonicalize(from)?, to)
 }
 
 pub fn symlink(from: impl AsRef<Path>, to: impl AsRef<Path>) -> Result<()> {
-    let from = canonicalize(from)?;
+    let from = from.as_ref();
     let to = to.as_ref();
-    symlink_impl(&from, to).context(format!(
+    symlink_impl(from, to).context(format!(
         "Failed to create symlink\n\
          <yellow> >></> From: {}\n\
          <yellow> >></> To: {}",

src/rgl/runner.rs

@@ -1,8 +1,7 @@
 use super::{Config, Session};
-use crate::fs::{copy_dir, empty_dir, rimraf, sync_dir, try_symlink};
+use crate::fs::{copy_dir, empty_dir, rimraf, symlink, sync_dir, try_symlink};
 use crate::{info, measure_time, warn};
 use anyhow::Result;
-use std::fs::create_dir_all;
 use std::path::Path;
 
 pub fn run_or_watch(profile_name: &str, watch: bool, cached: bool) -> Result<()> {
@@ -25,28 +24,15 @@ pub fn run_or_watch(profile_name: &str, watch: bool, cached: bool) -> Result<()>
             sync_dir(bp, &target_bp)?;
             sync_dir(rp, &target_rp)?;
         } else {
-            empty_dir(&temp)?;
             rimraf(&target_bp)?;
             rimraf(&target_rp)?;
             copy_dir(bp, &target_bp)?;
             copy_dir(rp, &target_rp)?;
         }
-        create_dir_all(&temp)?;
-        if !temp_bp.is_symlink() {
-            if temp_bp.exists() {
-                rimraf(&temp_bp)?;
-            }
-            try_symlink(&target_bp, &temp_bp)?;
-        }
-        if !temp_rp.is_symlink() {
-            if temp_rp.exists() {
-                rimraf(&temp_rp)?;
-            }
-            try_symlink(&target_rp, &temp_rp)?;
-        }
-        if !temp_data.is_symlink() {
-            try_symlink(config.get_data_path(), temp_data)?;
-        }
+        empty_dir(&temp)?;
+        symlink(&target_bp, temp_bp)?;
+        symlink(&target_rp, temp_rp)?;
+        try_symlink(config.get_data_path(), temp_data)?;
     });
 
     measure_time!(profile_name, {