From d56846528278c3f9a1cc6be5f4367c6d939eb11f Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Tue, 12 Nov 2024 16:12:32 -0800 Subject: [PATCH] add some small fixes --- kinode/src/vfs.rs | 2 +- scripts/build-packages/src/main.rs | 6 +++--- scripts/build-release.py | 4 ++-- scripts/build-windows-artifact.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kinode/src/vfs.rs b/kinode/src/vfs.rs index 89125662..8ef7f53b 100644 --- a/kinode/src/vfs.rs +++ b/kinode/src/vfs.rs @@ -343,7 +343,7 @@ async fn handle_request( // current prepend to filepaths needs to be: /package_id/drive/path let (package_id, drive, rest) = parse_package_and_drive(&request.path, &vfs_path)?; - let drive = format!("{package_id}/{drive}"); + let drive = format!("/{package_id}/{drive}"); let action = request.action; let path = PathBuf::from(&request.path); diff --git a/scripts/build-packages/src/main.rs b/scripts/build-packages/src/main.rs index 59411f5f..b68ba9b4 100644 --- a/scripts/build-packages/src/main.rs +++ b/scripts/build-packages/src/main.rs @@ -75,7 +75,7 @@ fn build_and_zip_package( } fn main() -> anyhow::Result<()> { - let matches = Command::new("build_packages") + let matches = Command::new("build-packages") .about("Build the core Kinode packages.") .arg( Arg::new("FEATURES") @@ -97,8 +97,8 @@ fn main() -> anyhow::Result<()> { ) .get_matches(); - // kinode/target/debug/build_package - let current_exe_dir = std::env::current_exe() // build_package + // kinode/target/debug/build-package + let current_exe_dir = std::env::current_exe() // build-package .unwrap(); let top_level_dir = current_exe_dir .parent() // debug/ diff --git a/scripts/build-release.py b/scripts/build-release.py index bd36ac1e..b602525e 100755 --- a/scripts/build-release.py +++ b/scripts/build-release.py @@ -33,7 +33,7 @@ def build_and_move(feature, tmp_dir, architecture, os_name): if feature: release_env["PATH_TO_PACKAGES_ZIP"] = f"../target/packages-{feature}.zip" subprocess.run( - ["cargo", "run", "-p", "build_packages", "--", "--features", feature], + ["cargo", "run", "-p", "build-packages", "--", "--features", feature], check=True, #stdout=subprocess.PIPE, #stderr=subprocess.PIPE, @@ -47,7 +47,7 @@ def build_and_move(feature, tmp_dir, architecture, os_name): ) zip_name = f"{zip_prefix}-{feature}.zip" else: - subprocess.run(["cargo", "run", "-p", "build_packages"], check=True) + subprocess.run(["cargo", "run", "-p", "build-packages"], check=True) subprocess.run( ["cargo", "build", "--release", "-p", "kinode"], check=True, diff --git a/scripts/build-windows-artifact.py b/scripts/build-windows-artifact.py index f60328af..34a4250f 100755 --- a/scripts/build-windows-artifact.py +++ b/scripts/build-windows-artifact.py @@ -68,7 +68,7 @@ def main(): subprocess.check_call([f'./{build_script_name}'], cwd=build_script_dir) # Run cargo build - subprocess.check_call(['cargo', 'build', '-p', 'build_packages'], cwd=repo_root) + subprocess.check_call(['cargo', 'build', '-p', 'build-packages'], cwd=repo_root) # Create the zip file output_zip = args.output