CloudNebulaProject/ips
1
0
Fork 0
mirror of https://codeberg.org/Toasterson/ips.git synced 2026-04-10 21:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Hotfix to add ! property value characters

Browse source
This commit is contained in:
Till Wegmueller 2021-05-01 16:05:28 -03:00
parent 8e08c9910b
commit f67ceb4b05
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -561,7 +561,7 @@ checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae"
[[package]] [[package]]
name = "libips" name = "libips"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"failure", "failure",
"maplit 0.1.6", "maplit 0.1.6",
@ -841,7 +841,7 @@ version = "0.0.1-placeholder"
[[package]] [[package]]
name = "pkg6dev" name = "pkg6dev"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"clap", "clap",
"failure", "failure",

2
libips/Cargo.toml
View file

@ -5,7 +5,7 @@
[package] [package]
name = "libips" name = "libips"
version = "0.1.0" version = "0.1.1"
authors = ["Till Wegmueller <till.wegmueller@openflowlabs.com>"] authors = ["Till Wegmueller <till.wegmueller@openflowlabs.com>"]
edition = "2018" edition = "2018"
license-file = "../LICENSE" license-file = "../LICENSE"

2
libips/src/actions/manifest.pest
View file

@ -62,7 +62,7 @@ transform_action = @{ transform_character*}
transform = {"<transform " ~ action_name ~ " " ~ property+ ~ " "? ~ "->" ~ " "? ~ transform_action ~ ">" } transform = {"<transform " ~ action_name ~ " " ~ property+ ~ " "? ~ "->" ~ " "? ~ transform_action ~ ">" }
property_name = @{ ( ASCII_ALPHANUMERIC | "." | "_" | "-" | "/" )+ } property_name = @{ ( ASCII_ALPHANUMERIC | "." | "_" | "-" | "/" )+ }
property_value = @{ ( ASCII_ALPHANUMERIC | "/" | "," | "." | "_" | "-" | "%" | "*" | "@" | "(" | ")" | "$" | ":" | "+" | "'" | "\\" )+ | quoted_string } property_value = @{ ( ASCII_ALPHANUMERIC | "/" | "," | "." | "_" | "-" | "%" | "*" | "@" | "(" | ")" | "$" | ":" | "+" | "'" | "\\" | "!" )+ | quoted_string }
payload = @{ property_value } payload = @{ property_value }
property = { property_name ~ "=" ~ property_value } property = { property_name ~ "=" ~ property_value }
action = { action_name ~ (( " " ~ payload ~ " " ) | " ")? ~ (property ~ " "?)+ ~ (" " | NEWLINE | EOI) } action = { action_name ~ (( " " ~ payload ~ " " ) | " ")? ~ (property ~ " "?)+ ~ (" " | NEWLINE | EOI) }

4
pkg6dev/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "pkg6dev" name = "pkg6dev"
version = "0.1.0" version = "0.1.1"
authors = ["Till Wegmueller <till.wegmueller@openflowlabs.com>"] authors = ["Till Wegmueller <till.wegmueller@openflowlabs.com>"]
edition = "2018" edition = "2018"
license-file = "LICENSE" license-file = "LICENSE"
@ -12,7 +12,7 @@ keywords = ["packaging", "illumos"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
libips = {path = "../libips", version = "0.1.0"} libips = {path = "../libips", version = "0.1.1"}
userland = {path = "../userland"} userland = {path = "../userland"}
failure = "0.1.8" failure = "0.1.8"
failure_derive = "0.1.8" failure_derive = "0.1.8"

8
pkg6dev/src/main.rs
View file

@ -22,16 +22,16 @@ use userland::repology::{find_newest_version};
fn main() { fn main() {
let component_arg = Arg::new("component") let component_arg = Arg::new("component")
.takes_value(true) .takes_value(true)
.default_value("../sample_data/pkgs/cups"); //.default_value("../sample_data/pkgs/cups");
.default_value("./");
let opts = app_from_crate!().subcommand(App::new("diff-component") let opts = app_from_crate!().subcommand(App::new("diff-component")
.about("shows differences between sample-manifest and manifests") .about("shows differences between sample-manifest and manifests")
.arg(&component_arg) .arg(&component_arg)
).subcommand(App::new("show-component") ).subcommand(App::new("show-component")
.about("Show informations about the component") .about("Show informations about the component")
.arg(&component_arg) .arg(&component_arg)
)//.get_matches(); ).get_matches();
.get_matches_from(vec!["pkg6dev", "show-component"]); //.get_matches_from(vec!["pkg6dev", "show-component"]);
if let Some(diff_component_opts) = opts.subcommand_matches("diff-component") { if let Some(diff_component_opts) = opts.subcommand_matches("diff-component") {
let res = diff_component(diff_component_opts); let res = diff_component(diff_component_opts);