From 58b3d3e5566f79b910913d1a8a51251ee9970e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= <41945903+qarmin@users.noreply.github.com> Date: Mon, 25 Apr 2022 20:47:05 +0200 Subject: [PATCH] Fix problem with cargo packing (#687) --- czkawka_gui/icons/icon_about.png | Bin 0 -> 4458 bytes czkawka_gui/src/gui_structs/gui_data.rs | 2 +- misc/cargo/PublishOther.sh | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 czkawka_gui/icons/icon_about.png diff --git a/czkawka_gui/icons/icon_about.png b/czkawka_gui/icons/icon_about.png new file mode 100644 index 0000000000000000000000000000000000000000..7d6cff77bda73cdc32bdecb69d39c1542d486a6a GIT binary patch literal 4458 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 X8~zYRr~0=mA1pS|yP{j7ZGZ1SIEe=X literal 0 HcmV?d00001 diff --git a/czkawka_gui/src/gui_structs/gui_data.rs b/czkawka_gui/src/gui_structs/gui_data.rs index 43318ce..ef49980 100644 --- a/czkawka_gui/src/gui_structs/gui_data.rs +++ b/czkawka_gui/src/gui_structs/gui_data.rs @@ -33,7 +33,7 @@ use crate::help_functions::BottomButtonsEnum; use crate::notebook_enums::*; use crate::taskbar_progress::TaskbarProgress; -pub const ICON_ABOUT: &[u8; 4458] = include_bytes!("../../../snap/gui/czkawka.png"); +pub const ICON_ABOUT: &[u8; 4458] = include_bytes!("../../icons/icon_about.png"); pub const CZK_ICON_ADD: &[u8; 677] = include_bytes!("../../icons/czk_add.svg"); pub const CZK_ICON_COMPARE: &[u8; 5700] = include_bytes!("../../icons/czk_compare.svg"); pub const CZK_ICON_DELETE: &[u8; 489] = include_bytes!("../../icons/czk_delete.svg"); diff --git a/misc/cargo/PublishOther.sh b/misc/cargo/PublishOther.sh index 475cd92..1c3d5d6 100755 --- a/misc/cargo/PublishOther.sh +++ b/misc/cargo/PublishOther.sh @@ -33,11 +33,11 @@ git reset --hard cd "$CZKAWKA_PATH/czkawka_cli" -sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_cli/Cargo.toml" -cargo publish --allow-dirty +# sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_cli/Cargo.toml" +cargo publish # --allow-dirty git reset --hard cd "$CZKAWKA_PATH/czkawka_gui" -sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_gui/Cargo.toml" -cargo publish --allow-dirty +# sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_gui/Cargo.toml" +cargo publish # --allow-dirty git reset --hard