rewatch.lock -> rescript.lock

Author: cknitt

rewatch/src/lock.rs

@@ -9,7 +9,7 @@ use sysinfo::{PidExt, System, SystemExt};
  * that's running, when trying to aquire a lock, it checks wether that process is still running. If
  * not, it rewrites the lockfile to have its own PID instead. */
 
-pub static LOCKFILE: &str = "rewatch.lock";
+pub static LOCKFILE: &str = "rescript.lock";
 
 pub enum Error {
     Locked(u32),

rewatch/src/watcher.rs

@@ -10,6 +10,7 @@ use crate::queue::*;
 use futures_timer::Delay;
 use notify::event::ModifyKind;
 use notify::{Config, Error, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
+use crate::lock::LOCKFILE;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::sync::Mutex;
@@ -109,8 +110,8 @@ async fn async_watch(
         }
 
         for event in events {
-            // if there is a file named rewatch.lock in the events path, we can quit the watcher
-            if let Some(_) = event.paths.iter().find(|path| path.ends_with("rewatch.lock")) {
+            // if there is a file named rescript.lock in the events path, we can quit the watcher
+            if let Some(_) = event.paths.iter().find(|path| path.ends_with(LOCKFILE)) {
                 match event.kind {
                     EventKind::Remove(_) => {
                         if show_progress {

rewatch/tests/lock.sh

@@ -17,7 +17,7 @@ fi
 
 exit_watcher() {
   # kill watcher by removing lock file
-  rm lib/rewatch.lock
+  rm lib/rescript.lock
 }
 
 rewatch_bg watch > /dev/null 2>&1 &

rewatch/tests/watch.sh

@@ -15,7 +15,7 @@ fi
 
 exit_watcher() {
   # kill watcher by removing lock file
-  rm lib/rewatch.lock
+  rm lib/rescript.lock
 }
 
 rewatch_bg watch > /dev/null 2>&1 &