fix: pkgr->ext pkgrfile
This commit is contained in:
parent
f54c72c8ec
commit
ee81acb953
3 changed files with 6 additions and 6 deletions
|
@ -30,12 +30,12 @@ pub fn mani_from_str(s: &str) -> Manifest<Option<PKGR>> {
|
|||
fs: mani.fs,
|
||||
bin: mani.bin,
|
||||
build: mani.build,
|
||||
pkgr: bmani.pkgr,
|
||||
ext: bmani.pkgr,
|
||||
}
|
||||
}
|
||||
|
||||
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 {
|
||||
fn run_command<S: Into<String>>(s: S) -> i32 {
|
||||
std::process::Command::new("sh")
|
||||
|
|
|
@ -16,7 +16,7 @@ pub struct Manifest<E: Clone = Option<ext::Extension>> {
|
|||
pub fs: fs::FS,
|
||||
pub bin: Option<bin::Bin>,
|
||||
pub build: Option<build::Build>,
|
||||
pub pkgr: E,
|
||||
pub ext: E,
|
||||
}
|
||||
|
||||
impl<P: Clone> Manifest<P> {
|
||||
|
@ -50,7 +50,7 @@ impl Default for Manifest {
|
|||
fs: fs::FS::default(),
|
||||
bin: None,
|
||||
build: None,
|
||||
pkgr: None,
|
||||
ext: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue