From 1a1d64805e36ffa19207b2e1fe1a86b2b9aa61eb Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Fri, 23 Feb 2024 22:18:07 +0300 Subject: [PATCH] PikaOS version 1.0.0 --- debian/changelog | 2 +- debian/control | 4 ++-- debian/rules | 15 +++++++++++++++ locales/en_US.json | 9 ++++++++- main.sh | 4 +++- src/build_ui/mod.rs | 12 ++++++------ 6 files changed, 35 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index d66dce0..7c28f70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-drivers (0.4.4-100pika2) pikauwu; urgency=medium +pika-drivers (1.0.0-100pika1) pikauwu; urgency=medium * initial release diff --git a/debian/control b/debian/control index 70ad9d8..cddd083 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,8 @@ Depends: libadwaita-1-0, gir1.2-gtk-4.0, gir1.2-adw-1, gir1.2-vte-3.91, - ubuntu-drivers-common, zenity, inxi, - coreutils + coreutils, + ${shlibs:Depends} Description: This utility is meant to be used in PikaOS to manage drivers. diff --git a/debian/rules b/debian/rules index 659a7c3..066afc9 100755 --- a/debian/rules +++ b/debian/rules @@ -3,3 +3,18 @@ %: dh ${@} +override_dh_auto_install: + /root/.cargo/bin/cargo fetch + /root/.cargo/bin/cargo build --release + mkdir -p debian/pika-drivers/usr/bin/ + cp -vf target/release/pika-drivers debian/pika-drivers/usr/bin/ + chmod 755 debian/pika-drivers/usr/bin/pika-drivers + mkdir -p debian/pika-drivers/usr/lib/pika/drivers/ + mkdir -p debian/pika-drivers/usr/share/glib-2.0/schemas/ + cp data/*.sh debian/pika-drivers/usr/lib/pika/drivers/ + cp data/*.xml debian/pika-drivers/usr/share/glib-2.0/schemas/ + chmod 755 debian/pika-drivers/usr/lib/pika/drivers/*.sh + mkdir -p debian/pika-drivers/usr/share/applications + mkdir -p debian/pika-drivers/usr/share/icons/hicolor/scalable/apps + cp -vf data/com.github.pikaos-linux.pikadrivers.svg debian/pika-drivers/usr/share/icons/hicolor/scalable/apps/ + cp -vf data/com.github.pikaos-linux.pikadrivers.desktop debian/pika-drivers/usr/share/applications/ \ No newline at end of file diff --git a/locales/en_US.json b/locales/en_US.json index d069ffc..7ce354c 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -9,5 +9,12 @@ "driver_install_button_tooltip_text": "Install the driver package.", "driver_remove_button_label": "Uninstall", "driver_remove_button_tooltip_text": "Uninstall the driver package.", - "driver_expander_row_title_suffix": " (WARNING: THIS DRIVER IS EXPERMINTAL USE AT YOUR OWN RISK!)" + "driver_expander_row_title_suffix": " (WARNING: THIS DRIVER IS EXPERIMENTAL USE AT YOUR OWN RISK!)", + "driver_install_dialog_heading": "Driver Processing Log", + "driver_install_dialog_ok_label": "Reboot later", + "driver_install_dialog_reboot_label": "Reboot now", + "driver_install_dialog_success_true": "Driver processed successfully!", + "driver_install_dialog_success_false": "Driver did not process successfully!", + "window_no_drivers_box_text_title": "No Devices require any special drivers", + "window_no_drivers_box_text_description": "No Devices installed on your system, have a special driver in our database." } \ No newline at end of file diff --git a/main.sh b/main.sh index 0a61389..b70619f 100755 --- a/main.sh +++ b/main.sh @@ -5,6 +5,8 @@ cd ./pika-drivers/ # Get build deps apt-get build-dep ./ -y +apt-get install curl -y +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/root/.cargo sh -s -- -y # Build package dpkg-buildpackage --no-sign @@ -12,4 +14,4 @@ dpkg-buildpackage --no-sign # Move the debs to output cd ../ mkdir -p ./output -mv ./*.deb ./output/ +mv ./*.deb ./output/ \ No newline at end of file diff --git a/src/build_ui/mod.rs b/src/build_ui/mod.rs index 6266910..45ba65a 100644 --- a/src/build_ui/mod.rs +++ b/src/build_ui/mod.rs @@ -360,7 +360,7 @@ fn get_drivers( .unwrap(); if command_installed_status.status.success() { driver_install_button.set_sensitive(false); - if driver.clone().removeble == false { + if driver.clone().removeble == true { driver_remove_button.set_sensitive(true); } } else { @@ -391,13 +391,13 @@ fn get_drivers( .extra_child(&driver_install_log_terminal_scroll) .width_request(400) .height_request(200) - .heading("driver_install_dialog_heading") + .heading(t!("driver_install_dialog_heading")) .build(); driver_install_dialog - .add_response("driver_install_dialog_ok", "driver_install_dialog_ok_label"); + .add_response("driver_install_dialog_ok", &t!("driver_install_dialog_ok_label").to_string()); driver_install_dialog.add_response( "driver_install_dialog_reboot", - "driver_install_dialog_reboot_label", + &t!("driver_install_dialog_reboot_label").to_string(), ); driver_install_dialog.set_response_appearance( "driver_install_dialog_reboot", @@ -501,8 +501,8 @@ fn get_drivers( } else { let window_no_drivers_box_text = adw::StatusPage::builder() .icon_name("face-cool") - .title(t!("first_setup_gameutils_box_text_title")) - .description(t!("first_setup_gameutils_box_text_description")) + .title(t!("window_no_drivers_box_text_title")) + .description(t!("window_no_drivers_box_text_description")) .build(); window_no_drivers_box_text.add_css_class("compact");