From ee81acb95351e25f923c0be9d25bf1dd05c141cc Mon Sep 17 00:00:00 2001 From: Raine Date: Sat, 14 Oct 2023 22:39:52 +0200 Subject: [PATCH] fix: pkgr->ext pkgrfile --- bootpkg/src/prelude.rs | 4 ++-- manifest/src/lib.rs | 4 ++-- pkgr/package.toml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bootpkg/src/prelude.rs b/bootpkg/src/prelude.rs index 9406cdb..b5ec6fe 100644 --- a/bootpkg/src/prelude.rs +++ b/bootpkg/src/prelude.rs @@ -30,12 +30,12 @@ pub fn mani_from_str(s: &str) -> Manifest> { fs: mani.fs, bin: mani.bin, build: mani.build, - pkgr: bmani.pkgr, + ext: bmani.pkgr, } } pub fn run_bootstrap(mani: Manifest>) -> bool { - if let Some(pkgr) = mani.pkgr { + if let Some(pkgr) = mani.ext { if let Some(bootstrap) = pkgr.bootstrap { fn run_command>(s: S) -> i32 { std::process::Command::new("sh") diff --git a/manifest/src/lib.rs b/manifest/src/lib.rs index af685e7..89526f2 100644 --- a/manifest/src/lib.rs +++ b/manifest/src/lib.rs @@ -16,7 +16,7 @@ pub struct Manifest> { pub fs: fs::FS, pub bin: Option, pub build: Option, - pub pkgr: E, + pub ext: E, } impl Manifest

{ @@ -50,7 +50,7 @@ impl Default for Manifest { fs: fs::FS::default(), bin: None, build: None, - pkgr: None, + ext: None, } } } diff --git a/pkgr/package.toml b/pkgr/package.toml index 723ebed..983ea03 100644 --- a/pkgr/package.toml +++ b/pkgr/package.toml @@ -48,13 +48,13 @@ install_script = "scripts/install" # relative to pkg ## pkgr.* # packager is the official client but you may use other clients supporting the "pkgr v1 spec". # other clients may offer extra functionality this must be put under "pkgr.*" -[pkgr] +[ext] ## pkgr.bootstrap # This section is used for bootpkg. An edition of packager that bootstraps the full version. # This exists so that packager is easy to install on anything! # and only 1 release channel for pkgr -[pkgr.bootstrap] +[ext.bootstrap] ## any non-zero = installed check_installed_commands = [ "file /usr/bin/pkgr"