diff --git a/assets/ui/first_run/page_2.blp b/assets/ui/first_run/page_2.blp index b9944cf..fdcf1c2 100644 --- a/assets/ui/first_run/page_2.blp +++ b/assets/ui/first_run/page_2.blp @@ -41,7 +41,7 @@ Gtk.Box page { } Gtk.Entry { - text: "sudo pacman -Syu git"; + text: "sudo pacman -Syu git xdelta3"; editable: false; } } @@ -56,7 +56,7 @@ Gtk.Box page { } Gtk.Entry { - text: "sudo apt install git"; + text: "sudo apt install git xdelta3"; editable: false; } } @@ -71,7 +71,7 @@ Gtk.Box page { } Gtk.Entry { - text: "sudo dnf install git"; + text: "sudo dnf install git xdelta"; editable: false; } } diff --git a/build.rs b/build.rs index 3015b64..d6ffb90 100644 --- a/build.rs +++ b/build.rs @@ -35,7 +35,7 @@ fn blp_process_dir(dir: String) { create_dir_all(&dist_dir).expect("UI dist dir couldn't be created"); } - println!("cargo:rerun-if-changed={}/*.blp", &source_dir); + // println!("cargo:rerun-if-changed={}/*.blp", &source_dir); for entry in entries { if let Ok(entry) = entry { diff --git a/src/ui/first_run/mod.rs b/src/ui/first_run/mod.rs index a18d27c..6e2109f 100644 --- a/src/ui/first_run/mod.rs +++ b/src/ui/first_run/mod.rs @@ -172,16 +172,18 @@ impl App { match action { Actions::FirstPageContinue => { match Command::new("git").stdout(Stdio::null()).spawn() { - Ok(_) => this.widgets.carousel.scroll_to(&this.widgets.page_3.page, true), + Ok(_) => match Command::new("xdelta3").stdout(Stdio::null()).spawn() { + Ok(_) => this.widgets.carousel.scroll_to(&this.widgets.page_3.page, true), + Err(_) => this.widgets.carousel.scroll_to(&this.widgets.page_2.page, true) + }, Err(_) => this.widgets.carousel.scroll_to(&this.widgets.page_2.page, true) } } Actions::SecondPageCheck => { - match Command::new("git").stdout(Stdio::null()).spawn() { - Ok(_) => this.widgets.carousel.scroll_to(&this.widgets.page_3.page, true), - Err(_) => { - // todo + if let Ok(_) = Command::new("git").stdout(Stdio::null()).spawn() { + if let Ok(_) = Command::new("xdelta3").stdout(Stdio::null()).spawn() { + this.widgets.carousel.scroll_to(&this.widgets.page_3.page, true); } } }