Skip to content

Commit d497bec

Browse files
committed
fix?
1 parent ce86f6b commit d497bec

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

rewatch/src/helpers.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,18 @@ pub fn create_path_for_path(path: &Path) {
152152

153153
pub fn get_bsc(root_path: &str, workspace_root: Option<String>) -> String {
154154
let subfolder = match (std::env::consts::OS, std::env::consts::ARCH) {
155-
("macos", "aarch64") => "darwinarm64",
156-
("macos", _) => "darwin",
157-
("linux", "aarch64") => "linuxarm64",
158-
("linux", _) => "linux",
159-
("windows", _) => "win32",
155+
("macos", "aarch64") => "darwin-arm64",
156+
("macos", _) => "darwin-x64",
157+
("linux", "aarch64") => "linux-arm64",
158+
("linux", _) => "linux-x64",
159+
("windows", "aarch64") => "win-arm64",
160+
("windows", _) => "win-x64",
160161
_ => panic!("Unsupported architecture"),
161162
};
162163

163164
match (
164165
PathBuf::from(format!(
165-
"{}/node_modules/rescript/{}/bsc.exe",
166+
"{}/node_modules/@rescript/{}/bin/bsc.exe",
166167
root_path, subfolder
167168
))
168169
.canonicalize(),

rewatch/tests/lock.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ fi
1515

1616
exit_watcher() {
1717
# Try to find parent process, if not found just kill the process directly
18-
PARENT_PROCS=$(pgrep -P $!)
19-
if [ -n "$PARENT_PROCS" ]; then
20-
kill $PARENT_PROCS &>/dev/null
21-
fi
18+
# PARENT_PROCS=$(pgrep -P $!)
19+
# if [ -n "$PARENT_PROCS" ]; then
20+
# kill $PARENT_PROCS &>/dev/null
21+
# fi
2222
# for if it's the node script that runs rewatch also kill the child processes
2323
CHILD_PROCS=$(pgrep -f rewatch)
2424
if [ -n "$CHILD_PROCS" ]; then

0 commit comments

Comments
 (0)