Make sure updates don't interact with inputless terminal
This commit is contained in:
parent
5f3e577ceb
commit
8f7f553a23
@ -1,4 +1,5 @@
|
||||
{
|
||||
"app_name": "",
|
||||
"first_setup_initial_box_text_title": "Добре дошли",
|
||||
"first_setup_initial_box_text_description": "Този асистент ще ви помогне да извършите инсталацията на PikaOS.",
|
||||
"first_setup_start_button_label": "Нека започнем",
|
||||
|
@ -1,4 +1,5 @@
|
||||
{
|
||||
"app_name": "",
|
||||
"first_setup_initial_box_text_title": "Willkommen",
|
||||
"first_setup_initial_box_text_description": "Dieser Assistent wird dir dabei helfen deine PikaOS installation abzuschließen.",
|
||||
"first_setup_start_button_label": "Lasst uns beginnen",
|
||||
|
@ -1,4 +1,5 @@
|
||||
{
|
||||
"app_name": "PikaOS First Setup",
|
||||
"first_setup_initial_box_text_title": "Welcome",
|
||||
"first_setup_initial_box_text_description": "This wizard will help you finish your PikaOS installation.",
|
||||
"first_setup_start_button_label": "Let's Start",
|
||||
|
@ -1,4 +1,5 @@
|
||||
{
|
||||
"app_name": "",
|
||||
"first_setup_initial_box_text_title": "Bienvenue",
|
||||
"first_setup_initial_box_text_description": "Cet assistant vous aidera à terminer l'installation de PikaOS",
|
||||
"first_setup_start_button_label": "Commencer",
|
||||
|
@ -1,4 +1,5 @@
|
||||
{
|
||||
"app_name": "",
|
||||
"first_setup_initial_box_text_title": "Benvenuto",
|
||||
"first_setup_initial_box_text_description": "Questo programma ti aiuterà a finire la tua installazione di PikaOS.",
|
||||
"first_setup_start_button_label": "Cominciamo",
|
||||
|
@ -1,4 +1,5 @@
|
||||
{
|
||||
"app_name": "",
|
||||
"first_setup_initial_box_text_title": "Välkommen",
|
||||
"first_setup_initial_box_text_description": "Den här installationsguiden hjälper dig att slutföra din PikaOS installation.",
|
||||
"first_setup_start_button_label": "Påbörja",
|
||||
|
@ -3,30 +3,28 @@ use adw::prelude::*;
|
||||
use adw::*;
|
||||
/// Use all gtk4 libraries (gtk4 -> gtk because cargo)
|
||||
/// Use all libadwaita libraries (libadwaita -> adw because cargo)
|
||||
|
||||
use crate::config::APP_ICON;
|
||||
// application crates
|
||||
/// first setup crates
|
||||
use crate::first_setup::*;
|
||||
|
||||
pub fn build_ui(app: &adw::Application) {
|
||||
// setup glib
|
||||
gtk::glib::set_prgname(Some("PikaOS First Setup"));
|
||||
glib::set_application_name("PikaOS First Setup");
|
||||
gtk::glib::set_prgname(Some(t!("app_name").to_string()));
|
||||
glib::set_application_name(&t!("app_name").to_string());
|
||||
|
||||
// create the main Application window
|
||||
let window = adw::ApplicationWindow::builder()
|
||||
// The text on the titlebar
|
||||
.title("PikaOS First Setup")
|
||||
.title(t!("app_name"))
|
||||
// link it to the application "app"
|
||||
.application(app)
|
||||
// Add the box called "window_box" to it
|
||||
// Application icon
|
||||
.icon_name("com.github.pikaos-linux.pikafirstsetup")
|
||||
.icon_name(APP_ICON)
|
||||
// Minimum Size/Default
|
||||
.width_request(700)
|
||||
.height_request(500)
|
||||
// Hide window instead of destroy
|
||||
.hide_on_close(true)
|
||||
.deletable(false)
|
||||
// Startup
|
||||
.startup_id("com.github.pikaos-linux.pikafirstsetup")
|
||||
|
@ -1,7 +1,5 @@
|
||||
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 DISTRO_ICON: &str = "pika-logo";
|
||||
//pub const VERSION: &str = env!("CARGO_PKG_VERSION");
|
||||
pub const APP_ICON: &str = "com.github.pikaos-linux.pikawelcome";
|
||||
//pub const APP_GITHUB: &str = "https://github.com/PikaOS-Linux/pkg-pika-welcome";
|
@ -20,11 +20,14 @@ use duct::cmd;
|
||||
use std::io::prelude::*;
|
||||
use std::io::BufReader;
|
||||
|
||||
const CODEC_INSTALL_PROG: &str = "
|
||||
const CODEC_INSTALL_PROG: &str = r###"
|
||||
#! /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
|
||||
";
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
DEBIAN_FRONTEND=noninteractive
|
||||
/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt update -y -o Dpkg::Options::="--force-confnew" || exit 1
|
||||
/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt install pika-codecs-meta -y -o Dpkg::Options::="--force-confnew" || exit 1
|
||||
"###;
|
||||
|
||||
fn codec_install(
|
||||
log_loop_sender: async_channel::Sender<String>,
|
||||
|
@ -20,11 +20,14 @@ use duct::cmd;
|
||||
use std::io::prelude::*;
|
||||
use std::io::BufReader;
|
||||
|
||||
const GAMEUTILS_INSTALL_PROG: &str = "
|
||||
const GAMEUTILS_INSTALL_PROG: &str = r###"
|
||||
#! /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
|
||||
";
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
DEBIAN_FRONTEND=noninteractive
|
||||
/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt update -y -o Dpkg::Options::="--force-confnew" || exit 1
|
||||
/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt install pika-gameutils-meta -y -o Dpkg::Options::="--force-confnew" || exit 1
|
||||
"###;
|
||||
|
||||
fn gameutils_install(
|
||||
log_loop_sender: async_channel::Sender<String>,
|
||||
|
@ -20,11 +20,14 @@ use duct::cmd;
|
||||
use std::io::prelude::*;
|
||||
use std::io::BufReader;
|
||||
|
||||
const APT_UPDATE_PROG: &str = "
|
||||
const APT_UPDATE_PROG: &str = r###"
|
||||
#! /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
|
||||
";
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
DEBIAN_FRONTEND=noninteractive
|
||||
/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt update -y -o Dpkg::Options::="--force-confnew" || exit 1
|
||||
/usr/lib/pika/pika-first-setup-gtk4/scripts/pika-sudo.sh apt full-upgrade -y -o Dpkg::Options::="--force-confnew" || exit 1
|
||||
"###;
|
||||
|
||||
fn apt_update(
|
||||
log_loop_sender: async_channel::Sender<String>,
|
||||
|
Loading…
Reference in New Issue
Block a user