diff --git a/Cargo.lock b/Cargo.lock index dc3987d..b6bce41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -561,7 +561,7 @@ checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae" [[package]] name = "libips" -version = "0.1.0" +version = "0.1.1" dependencies = [ "failure", "maplit 0.1.6", @@ -841,7 +841,7 @@ version = "0.0.1-placeholder" [[package]] name = "pkg6dev" -version = "0.1.0" +version = "0.1.1" dependencies = [ "clap", "failure", diff --git a/libips/Cargo.toml b/libips/Cargo.toml index a601ceb..638f517 100644 --- a/libips/Cargo.toml +++ b/libips/Cargo.toml @@ -5,7 +5,7 @@ [package] name = "libips" -version = "0.1.0" +version = "0.1.1" authors = ["Till Wegmueller "] edition = "2018" license-file = "../LICENSE" diff --git a/libips/src/actions/manifest.pest b/libips/src/actions/manifest.pest index efe18ec..5d78cce 100644 --- a/libips/src/actions/manifest.pest +++ b/libips/src/actions/manifest.pest @@ -62,7 +62,7 @@ transform_action = @{ transform_character*} transform = {"" ~ " "? ~ transform_action ~ ">" } property_name = @{ ( ASCII_ALPHANUMERIC | "." | "_" | "-" | "/" )+ } -property_value = @{ ( ASCII_ALPHANUMERIC | "/" | "," | "." | "_" | "-" | "%" | "*" | "@" | "(" | ")" | "$" | ":" | "+" | "'" | "\\" )+ | quoted_string } +property_value = @{ ( ASCII_ALPHANUMERIC | "/" | "," | "." | "_" | "-" | "%" | "*" | "@" | "(" | ")" | "$" | ":" | "+" | "'" | "\\" | "!" )+ | quoted_string } payload = @{ property_value } property = { property_name ~ "=" ~ property_value } action = { action_name ~ (( " " ~ payload ~ " " ) | " ")? ~ (property ~ " "?)+ ~ (" " | NEWLINE | EOI) } diff --git a/pkg6dev/Cargo.toml b/pkg6dev/Cargo.toml index c759d9d..2ca0510 100644 --- a/pkg6dev/Cargo.toml +++ b/pkg6dev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pkg6dev" -version = "0.1.0" +version = "0.1.1" authors = ["Till Wegmueller "] edition = "2018" 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 [dependencies] -libips = {path = "../libips", version = "0.1.0"} +libips = {path = "../libips", version = "0.1.1"} userland = {path = "../userland"} failure = "0.1.8" failure_derive = "0.1.8" diff --git a/pkg6dev/src/main.rs b/pkg6dev/src/main.rs index a6ce813..8e7ced4 100644 --- a/pkg6dev/src/main.rs +++ b/pkg6dev/src/main.rs @@ -22,16 +22,16 @@ use userland::repology::{find_newest_version}; fn main() { let component_arg = Arg::new("component") .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") .about("shows differences between sample-manifest and manifests") .arg(&component_arg) ).subcommand(App::new("show-component") .about("Show informations about the component") .arg(&component_arg) - )//.get_matches(); - .get_matches_from(vec!["pkg6dev", "show-component"]); + ).get_matches(); + //.get_matches_from(vec!["pkg6dev", "show-component"]); if let Some(diff_component_opts) = opts.subcommand_matches("diff-component") { let res = diff_component(diff_component_opts);