Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
wiiznokes committed Nov 4, 2024
1 parent 4ec6c26 commit caa1c0c
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 19 deletions.
7 changes: 7 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions configurator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ configurator_utils.workspace = true
light_enum = "0.2"
include_dir = "0.7"
bon.workspace = true
constcat = "0.5"

[dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic"
Expand Down
4 changes: 2 additions & 2 deletions configurator/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ use crate::{
};

pub const QUALIFIER: &str = "io.github";
pub const ORG: &str = "wiiznokes";
pub const ORG: &str = "cosmic-utils";
pub const APP: &str = "configurator";
pub const APPID: &str = "io.github.wiiznokes.configurator";
pub const APPID: &str = constcat::concat!(QUALIFIER, ".", ORG, ".", APP);

#[derive(Debug)]
pub enum Dialog {
Expand Down
5 changes: 1 addition & 4 deletions configurator/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ impl Default for Config {
Self {
last_used_page: Default::default(),
cosmic_compat: true,
masked: vec![
"io.github.wiiznokes.cosmic-ext-applet-clipboard-manager".into(),
APPID.into(),
],
masked: vec![],
}
}
}
Expand Down
13 changes: 4 additions & 9 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ base-dir := absolute_path(clean(rootdir / prefix))
share-dst := base-dir / 'share'

bin-dst := base-dir / 'bin' / name
desktop-dst := share-dst / 'applications' / APPID + '.desktop'
icon-dst := share-dst / 'icons/hicolor/scalable/apps' / APPID + '-symbolic.svg'
env-dst := rootdir / 'etc/profile.d' / NAME + '.sh'
schema-dst := share-dst / 'configurator' / APPID + '.json'
desktop-dst := share-dst / 'applications' / appid + '.desktop'
icon-dst := share-dst / 'icons/hicolor/scalable/apps' / appid + '-symbolic.svg'
env-dst := rootdir / 'etc/profile.d' / name + '.sh'
schema-dst := share-dst / 'configurator' / appid + '.json'

default: build-release

Expand Down Expand Up @@ -50,11 +50,6 @@ uninstall_schema:
rm {{schema-dst}}


install: install_schema
install -Dm0755 {{bin-src}} {{bin-dst}}



# require to git clone https://github.com/json-schema-org/JSON-Schema-Test-Suite
test_suite:
cargo test test_all_suite -- --nocapture --ignored
Expand Down
5 changes: 1 addition & 4 deletions res/config_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
},
"masked": {
"description": "masked appid",
"default": [
"io.github.wiiznokes.cosmic-ext-applet-clipboard-manager",
"io.github.wiiznokes.configurator"
],
"default": [],
"type": "array",
"items": {
"type": "string"
Expand Down

0 comments on commit caa1c0c

Please sign in to comment.