strix/packager
strix/packager
1
0
Fork 0
Code Issues 2 Pull requests Releases 4 Activity

fix: pkgr->ext pkgrfile

Browse source
This commit is contained in:
Strix 2023-10-14 22:39:52 +02:00
parent f54c72c8ec
commit ee81acb953
No known key found for this signature in database
GPG key ID: 49B2E37B8915B774
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootpkg/src/prelude.rs
View file

@ -30,12 +30,12 @@ pub fn mani_from_str(s: &str) -> Manifest<Option<PKGR>> {
fs: mani.fs, fs: mani.fs,
bin: mani.bin, bin: mani.bin,
build: mani.build, build: mani.build,
pkgr: bmani.pkgr, ext: bmani.pkgr,
} }
} }
pub fn run_bootstrap(mani: Manifest<Option<PKGR>>) -> bool { pub fn run_bootstrap(mani: Manifest<Option<PKGR>>) -> bool {
if let Some(pkgr) = mani.pkgr { if let Some(pkgr) = mani.ext {
if let Some(bootstrap) = pkgr.bootstrap { if let Some(bootstrap) = pkgr.bootstrap {
fn run_command<S: Into<String>>(s: S) -> i32 { fn run_command<S: Into<String>>(s: S) -> i32 {
std::process::Command::new("sh") std::process::Command::new("sh")

4
manifest/src/lib.rs
View file

@ -16,7 +16,7 @@ pub struct Manifest<E: Clone = Option<ext::Extension>> {
pub fs: fs::FS, pub fs: fs::FS,
pub bin: Option<bin::Bin>, pub bin: Option<bin::Bin>,
pub build: Option<build::Build>, pub build: Option<build::Build>,
pub pkgr: E, pub ext: E,
} }
impl<P: Clone> Manifest<P> { impl<P: Clone> Manifest<P> {
@ -50,7 +50,7 @@ impl Default for Manifest {
fs: fs::FS::default(), fs: fs::FS::default(),
bin: None, bin: None,
build: None, build: None,
pkgr: None, ext: None,
} }
} }
} }

4
pkgr/package.toml
View file

@ -48,13 +48,13 @@ install_script = "scripts/install" # relative to pkg
## pkgr.* ## pkgr.*
# packager is the official client but you may use other clients supporting the "pkgr v1 spec". # 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.*" # other clients may offer extra functionality this must be put under "pkgr.*"
[pkgr] [ext]
## pkgr.bootstrap ## pkgr.bootstrap
# This section is used for bootpkg. An edition of packager that bootstraps the full version. # 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! # This exists so that packager is easy to install on anything!
# and only 1 release channel for pkgr # and only 1 release channel for pkgr
[pkgr.bootstrap] [ext.bootstrap]
## any non-zero = installed ## any non-zero = installed
check_installed_commands = [ check_installed_commands = [
"file /usr/bin/pkgr" "file /usr/bin/pkgr"