From 1222b002182ded04dc42122e7d4c71e61921dc59 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sat, 24 Feb 2024 00:28:26 +0300 Subject: [PATCH] Setup Project --- Cargo.lock | 2 +- Cargo.toml | 4 +- Makefile | 16 +- README.md | 2 +- ...m.github.pikaos-linux.pikawelcome.desktop} | 4 +- ...thub.pikaos-linux.pikawelcome.gschema.xml} | 2 +- ...> com.github.pikaos-linux.pikawelcome.svg} | 1664 ++++++++--------- debian/changelog | 2 +- debian/control | 4 +- debian/rules | 24 +- main.sh | 6 +- makepot | 2 +- src/build_ui.rs | 4 +- src/config.rs | 7 +- src/first_setup/codec_carousel/mod.rs | 2 +- src/first_setup/final_carousel/mod.rs | 2 +- src/first_setup/gameutils_carousel/mod.rs | 2 +- src/first_setup/update_carousel/mod.rs | 2 +- src/first_setup/user_carousel/mod.rs | 2 +- 19 files changed, 874 insertions(+), 879 deletions(-) rename data/{com.github.pikaos-linux.pikafirstsetup.desktop => com.github.pikaos-linux.pikawelcome.desktop} (66%) rename data/{com.github.pikaos-linux.pikafirstsetup.gschema.xml => com.github.pikaos-linux.pikawelcome.gschema.xml} (82%) rename data/{com.github.pikaos-linux.pikafirstsetup.svg => com.github.pikaos-linux.pikawelcome.svg} (99%) diff --git a/Cargo.lock b/Cargo.lock index 51b4af7..3e736d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -815,7 +815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] -name = "pika-first-setup-gtk4" +name = "pika-welcome" version = "1.0.1" dependencies = [ "async-channel", diff --git a/Cargo.toml b/Cargo.toml index 1fe57d4..daef257 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "pika-first-setup-gtk4" -version = "1.0.1" +name = "pika-welcome" +version = "5.0.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/Makefile b/Makefile index f50b022..da10667 100644 --- a/Makefile +++ b/Makefile @@ -7,15 +7,15 @@ install: mkdir -p $(DESTDIR)/usr/bin/ cargo fetch cargo build --release - cp -vf target/release/pika-first-setup-gtk4 $(DESTDIR)/usr/bin/ - chmod 755 $(DESTDIR)/usr/bin/pika-first-setup-gtk4 + cp -vf target/release/pika-welcome $(DESTDIR)/usr/bin/ + chmod 755 $(DESTDIR)/usr/bin/pika-welcome mkdir -p $(DESTDIR)/usr/share/glib-2.0/schemas/ - mkdir -p $(DESTDIR)/usr/lib/pika/pika-first-setup-gtk4/scripts/ - cp -rvf data/scripts/*.sh $(DESTDIR)/usr/lib/pika/pika-first-setup-gtk4/scripts/ - chmod 755 $(DESTDIR)/usr/lib/pika/pika-first-setup-gtk4/scripts/*.sh - cp data/com.github.pikaos-linux.pikafirstsetup.gschema.xml $(DESTDIR)/usr/share/glib-2.0/schemas/ + mkdir -p $(DESTDIR)/usr/lib/pika/pika-welcome/scripts/ + cp -rvf data/scripts/*.sh $(DESTDIR)/usr/lib/pika/pika-welcome/scripts/ + chmod 755 $(DESTDIR)/usr/lib/pika/pika-welcome/scripts/*.sh + cp data/com.github.pikaos-linux.pikawelcome.gschema.xml $(DESTDIR)/usr/share/glib-2.0/schemas/ mkdir -p $(DESTDIR)/usr/share/applications - cp -vf data/com.github.pikaos-linux.pikafirstsetup.desktop $(DESTDIR)/usr/share/applications/ + cp -vf data/com.github.pikaos-linux.pikawelcome.desktop $(DESTDIR)/usr/share/applications/ mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/apps - cp -vf data/com.github.pikaos-linux.pikafirstsetup.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/ + cp -vf data/com.github.pikaos-linux.pikawelcome.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/ #makepot $(DESTDIR)/usr/share/locale diff --git a/README.md b/README.md index 43dbcda..881e055 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ for handling initial user setup on PikaOS. ### Help Us #### You can help by translating the app -[Weblate](https://hosted.weblate.org/projects/pikaos/pika-first-setup/) +[Weblate](https://hosted.weblate.org/projects/pikaos/pika-welcome/) diff --git a/data/com.github.pikaos-linux.pikafirstsetup.desktop b/data/com.github.pikaos-linux.pikawelcome.desktop similarity index 66% rename from data/com.github.pikaos-linux.pikafirstsetup.desktop rename to data/com.github.pikaos-linux.pikawelcome.desktop index cd3bbc9..8adce08 100644 --- a/data/com.github.pikaos-linux.pikafirstsetup.desktop +++ b/data/com.github.pikaos-linux.pikawelcome.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Type=Application Name=PikaOS Initial User Setup -Exec=pika-first-setup-gtk4 +Exec=pika-welcome Hidden=false NoDisplay=true -Icon=com.github.pikaos-linux.pikafirstsetup +Icon=com.github.pikaos-linux.pikawelcome X-GNOME-Autostart-enabled=true X-KDE-AutostartScript=true Categories=GNOME;GTK;Utility; diff --git a/data/com.github.pikaos-linux.pikafirstsetup.gschema.xml b/data/com.github.pikaos-linux.pikawelcome.gschema.xml similarity index 82% rename from data/com.github.pikaos-linux.pikafirstsetup.gschema.xml rename to data/com.github.pikaos-linux.pikawelcome.gschema.xml index 1970bfa..31a6f38 100644 --- a/data/com.github.pikaos-linux.pikafirstsetup.gschema.xml +++ b/data/com.github.pikaos-linux.pikawelcome.gschema.xml @@ -1,6 +1,6 @@ - + 700 Default window width diff --git a/data/com.github.pikaos-linux.pikafirstsetup.svg b/data/com.github.pikaos-linux.pikawelcome.svg similarity index 99% rename from data/com.github.pikaos-linux.pikafirstsetup.svg rename to data/com.github.pikaos-linux.pikawelcome.svg index 2fb5c74..2b88df3 100644 --- a/data/com.github.pikaos-linux.pikafirstsetup.svg +++ b/data/com.github.pikaos-linux.pikawelcome.svg @@ -1,832 +1,832 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian/changelog b/debian/changelog index 1dfb4d4..4b417b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-first-setup (1.0.1-100pika3) pikauwu; urgency=low +pika-welcome (5.0.0-100pika1) pikauwu; urgency=low * First release diff --git a/debian/control b/debian/control index aa97a26..e45b29b 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: pika-first-setup +Source: pika-welcome Section: utils Priority: optional Maintainer: International Arms dealers @@ -12,7 +12,7 @@ Build-Depends: build-essential, libvte-2.91-gtk4-dev Rules-Requires-Root: no -Package: pika-first-setup-gtk4 +Package: pika-welcome Architecture: any Depends: ${shlibs:Depends} Description: A frontend in GTK 4 and Libadwaita for initial user setup in pika. diff --git a/debian/rules b/debian/rules index aa23fea..ce9e36c 100755 --- a/debian/rules +++ b/debian/rules @@ -10,17 +10,17 @@ export PATH := "/root/.cargo/bin:$(PWD):$(PATH)" dh $@ override_dh_auto_install: - mkdir -p debian/pika-first-setup-gtk4/usr/bin/ + mkdir -p debian/pika-welcome/usr/bin/ /root/.cargo/bin/cargo fetch /root/.cargo/bin/cargo build --release - cp -vf target/release/pika-first-setup-gtk4 debian/pika-first-setup-gtk4/usr/bin/ - chmod 755 debian/pika-first-setup-gtk4/usr/bin/pika-first-setup-gtk4 - mkdir -p debian/pika-first-setup-gtk4/usr/share/glib-2.0/schemas/ - mkdir -p debian/pika-first-setup-gtk4/usr/lib/pika/pika-first-setup-gtk4/scripts/ - cp -rvf data/scripts/*.sh debian/pika-first-setup-gtk4/usr/lib/pika/pika-first-setup-gtk4/scripts/ - chmod 755 debian/pika-first-setup-gtk4/usr/lib/pika/pika-first-setup-gtk4/scripts/*.sh - cp data/com.github.pikaos-linux.pikafirstsetup.gschema.xml debian/pika-first-setup-gtk4/usr/share/glib-2.0/schemas/ - mkdir -p debian/pika-first-setup-gtk4/usr/share/applications - cp -vf data/com.github.pikaos-linux.pikafirstsetup.desktop debian/pika-first-setup-gtk4/usr/share/applications/ - mkdir -p debian/pika-first-setup-gtk4/usr/share/icons/hicolor/scalable/apps - cp -vf data/com.github.pikaos-linux.pikafirstsetup.svg debian/pika-first-setup-gtk4/usr/share/icons/hicolor/scalable/apps/ + cp -vf target/release/pika-welcome debian/pika-welcome/usr/bin/ + chmod 755 debian/pika-welcome/usr/bin/pika-welcome + mkdir -p debian/pika-welcome/usr/share/glib-2.0/schemas/ + mkdir -p debian/pika-welcome/usr/lib/pika/pika-welcome/scripts/ + cp -rvf data/scripts/*.sh debian/pika-welcome/usr/lib/pika/pika-welcome/scripts/ + chmod 755 debian/pika-welcome/usr/lib/pika/pika-welcome/scripts/*.sh + cp data/com.github.pikaos-linux.pikawelcome.gschema.xml debian/pika-welcome/usr/share/glib-2.0/schemas/ + mkdir -p debian/pika-welcome/usr/share/applications + cp -vf data/com.github.pikaos-linux.pikawelcome.desktop debian/pika-welcome/usr/share/applications/ + mkdir -p debian/pika-welcome/usr/share/icons/hicolor/scalable/apps + cp -vf data/com.github.pikaos-linux.pikawelcome.svg debian/pika-welcome/usr/share/icons/hicolor/scalable/apps/ diff --git a/main.sh b/main.sh index 5b4d267..3123fb5 100644 --- a/main.sh +++ b/main.sh @@ -1,7 +1,7 @@ # Clone Upstream -mkdir -p ./pika-first-setup -rsync -av --progress ./* ./pika-first-setup --exclude ./pika-first-setup -cd ./pika-first-setup +mkdir -p ./pika-welcome +rsync -av --progress ./* ./pika-welcome --exclude ./pika-welcome +cd ./pika-welcome # Get build deps apt-get build-dep ./ -y diff --git a/makepot b/makepot index 0a75270..4deb8bf 100755 --- a/makepot +++ b/makepot @@ -5,5 +5,5 @@ set -e for i in po/*.po do mkdir -p "$1"/"$(echo $i | cut -d"/" -f2 | cut -d"." -f1)"/LC_MESSAGES - msgfmt -v $i -o "$1"/"$(echo $i | cut -d"/" -f2 | cut -d"." -f1)"/LC_MESSAGES/pika-first-setup-gtk4.mo + msgfmt -v $i -o "$1"/"$(echo $i | cut -d"/" -f2 | cut -d"." -f1)"/LC_MESSAGES/pika-welcome.mo done \ No newline at end of file diff --git a/src/build_ui.rs b/src/build_ui.rs index cf2eb20..4dda576 100644 --- a/src/build_ui.rs +++ b/src/build_ui.rs @@ -21,7 +21,7 @@ pub fn build_ui(app: &adw::Application) { .application(app) // Add the box called "window_box" to it // Application icon - .icon_name("com.github.pikaos-linux.pikafirstsetup") + .icon_name("com.github.pikaos-linux.pikawelcome") // Minimum Size/Default .width_request(700) .height_request(500) @@ -29,7 +29,7 @@ pub fn build_ui(app: &adw::Application) { .hide_on_close(true) .deletable(false) // Startup - .startup_id("com.github.pikaos-linux.pikafirstsetup") + .startup_id("com.github.pikaos-linux.pikawelcome") // build the window .build(); diff --git a/src/config.rs b/src/config.rs index c424d79..d8b6c9a 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,7 +1,2 @@ -pub const APP_ID: &str = "com.github.pikaos-linux.pikafirstsetup"; -//pub const GETTEXT_PACKAGE: &str = env!("CARGO_PKG_NAME"); -//pub const LOCALEDIR: &str = "/usr/share/locale"; -//pub const PKGDATADIR: &str = " /usr/share"; -//pub const RESOURCES_FILE: &str = concat!(@PKGDATADIR@, "/resources.gresource"); -//pub const VERSION: &str = env!("CARGO_PKG_VERSION"); +pub const APP_ID: &str = "com.github.pikaos-linux.pikawelcome"; pub const DISTRO_ICON: &str = "pika-logo"; diff --git a/src/first_setup/codec_carousel/mod.rs b/src/first_setup/codec_carousel/mod.rs index f6e7e7a..8d9c25f 100644 --- a/src/first_setup/codec_carousel/mod.rs +++ b/src/first_setup/codec_carousel/mod.rs @@ -23,7 +23,7 @@ use std::io::BufReader; const CODEC_INSTALL_PROG: &str = " #! /bin/bash set -e -/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt update -y && /usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt install pika-codecs-meta -y +/usr/lib/pika/pika-welcome/scripts/pika-sudo.sh apt update -y && /usr/lib/pika/pika-welcome/scripts/pika-sudo.sh apt install pika-codecs-meta -y "; fn codec_install( diff --git a/src/first_setup/final_carousel/mod.rs b/src/first_setup/final_carousel/mod.rs index 40b9064..21f0ab9 100644 --- a/src/first_setup/final_carousel/mod.rs +++ b/src/first_setup/final_carousel/mod.rs @@ -46,6 +46,6 @@ pub fn final_carousel(first_setup_carousel: &adw::Carousel) { first_setup_carousel.append(&first_setup_final_box); first_setup_start_button.connect_clicked( move |_| { - let _ = cmd!("/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh", "bash", "-c", REBOOT_PROG).read(); + let _ = cmd!("/usr/lib/pika/pika-welcome/scripts/pika-sudo.sh", "bash", "-c", REBOOT_PROG).read(); }); } diff --git a/src/first_setup/gameutils_carousel/mod.rs b/src/first_setup/gameutils_carousel/mod.rs index ccf43e5..d43ef9c 100644 --- a/src/first_setup/gameutils_carousel/mod.rs +++ b/src/first_setup/gameutils_carousel/mod.rs @@ -23,7 +23,7 @@ use std::io::BufReader; const GAMEUTILS_INSTALL_PROG: &str = " #! /bin/bash set -e -/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt update -y && /usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt install pika-gameutils-meta -y +/usr/lib/pika/pika-welcome/scripts/pika-sudo.sh apt update -y && /usr/lib/pika/pika-welcome/scripts/pika-sudo.sh apt install pika-gameutils-meta -y "; fn gameutils_install( diff --git a/src/first_setup/update_carousel/mod.rs b/src/first_setup/update_carousel/mod.rs index 415413f..59a8232 100644 --- a/src/first_setup/update_carousel/mod.rs +++ b/src/first_setup/update_carousel/mod.rs @@ -23,7 +23,7 @@ use std::io::BufReader; const APT_UPDATE_PROG: &str = " #! /bin/bash set -e -/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt update -y && /usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt full-upgrade -y +/usr/lib/pika/pika-welcome/scripts/pika-sudo.sh apt update -y && /usr/lib/pika/pika-welcome/scripts/pika-sudo.sh apt full-upgrade -y "; fn apt_update( diff --git a/src/first_setup/user_carousel/mod.rs b/src/first_setup/user_carousel/mod.rs index 20a763e..12be2db 100644 --- a/src/first_setup/user_carousel/mod.rs +++ b/src/first_setup/user_carousel/mod.rs @@ -317,7 +317,7 @@ pub fn user_carousel(first_setup_carousel: &adw::Carousel) { })); user_next_button.connect_clicked(clone!(@weak first_setup_carousel, @weak user_info_username, @weak user_info_hostname, @weak user_info_password, @weak user_info_full_name, @weak user_info_hostname_valid => move |_| { - let result = cmd!("/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh", "bash", "-c", USER_CREATE_PROG, &user_info_username.text(), &user_info_password.text(), &user_info_full_name.text(), &user_info_hostname.text()).read(); + let result = cmd!("/usr/lib/pika/pika-welcome/scripts/pika-sudo.sh", "bash", "-c", USER_CREATE_PROG, &user_info_username.text(), &user_info_password.text(), &user_info_full_name.text(), &user_info_hostname.text()).read(); assert!(result.is_ok()); first_setup_carousel.scroll_to(&first_setup_carousel.nth_page(3), true); }));