change to linux612

update yay command

Cargo.lock

@@ -24,7 +24,7 @@ dependencies = [
 
 [[package]]
 name = "alma"
-version = "0.11.0"
+version = "0.11.1"
 dependencies = [
  "anyhow",
  "byte-unit",
@@ -91,12 +91,12 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa"
 dependencies = [
  "anstyle",
- "once_cell",
+ "once_cell_polyfill",
  "windows-sys",
 ]
 
@@ -176,6 +176,12 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "bumpalo"
+version = "3.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+
 [[package]]
 name = "byte-unit"
 version = "5.1.6"
@@ -481,6 +487,16 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -538,6 +554,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
 [[package]]
 name = "portable-atomic"
 version = "1.11.0"
@@ -781,6 +803,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+
 [[package]]
 name = "ryu"
 version = "1.0.20"
@@ -1049,9 +1077,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
 
 [[package]]
 name = "vec_map"
@@ -1080,6 +1112,64 @@ dependencies = [
  "wit-bindgen-rt",
 ]
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
 [[package]]
 name = "which"
 version = "7.0.3"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "alma"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Roey Darwish Dror, PurpleCow"]
 edition = "2021"
 

README.md

@@ -1,5 +1,5 @@
 # ALMA - Arch Linux Mobile Appliance
-![rust event push](https://git.spaeth.biz/Lila-Kuh/alma/actions/workflows/rust.yaml/badge.svg?branch=master&event=push)
+![rust event push](https://git.spaeth.biz/Lila-Kuh/alma/actions/workflows/rust.yml/badge.svg?branch=master&event=push)
 ---
 Almost every live Linux distribution out there is meant for a specific purpose, whether it's data
 rescue, privacy, penetration testing or anything else. There are some more generic distributions

src/aur.rs

@@ -37,10 +37,10 @@ impl FromStr for AurHelper {
                 install_command: vec![
                     String::from("yay"),
                     String::from("-S"),
-                    String::from("--nocleanmenu"),
+                    String::from("--cleanmenu=false"),
-                    String::from("--nodiffmenu"),
+                    String::from("--diffmenu=false"),
-                    String::from("--noeditmenu"),
+                    String::from("--editmenu=false"),
-                    String::from("--noupgrademenu"),
+                    String::from(""),
                     String::from("--useask"),
                     String::from("--removemake"),
                     String::from("--norebuild"),
@@ -49,7 +49,7 @@ impl FromStr for AurHelper {
                     String::from("--answerclean"),
                     String::from("None"),
                     String::from("--mflags"),
-                    String::from("--noconfirm"),
+                    String::from(""),
                 ],
             }),
             _ => Err(anyhow!("Error parsing AUR helper string: {}", s)),

src/constants.rs

@@ -9,8 +9,8 @@ SystemMaxUse=16M
 
 pub const BASE_PACKAGES: [&str; 9] = [
     "base",
-    "linux61",
+    "linux612",
-    "linux61-broadcom-wl",
+    "linux612-broadcom-wl",
     "linux-firmware",
     "grub",
     "efibootmgr",

src/main.rs

@@ -433,7 +433,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
     arch_chroot
         .execute()
         .arg(mount_point.path())
-        .args(["mkinitcpio", "-p", "linux61"])
+        .args(["mkinitcpio", "-p", "linux612"])
         .run()
         .context("Failed to run mkinitcpio - do you have the base and linux packages installed?")?;