Merge pull request #65 from tsirysndr/fix/minikube-install-on-mac

fix: minikube install on mac

README.md

@@ -208,7 +208,7 @@ jobs:
       - name: Setup Crosup
         uses: tsirysndr/setup-crosup@v1
         with:
-          version: 'v0.4.9'
+          version: 'v0.4.10'
           # Add packages to install here
           packages: |
             deno

crates/cli/Cargo.toml

@@ -8,22 +8,22 @@ license = "MIT"
 name = "crosup"
 readme = "../../README.md"
 repository = "https://github.com/tsirysndr/crosup"
-version = "0.4.9"
+version = "0.4.10"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.71"
 clap = "3.2.20"
-crosup-core = {path = "../core", version = "0.1.8"}
+crosup-core = {path = "../core", version = "0.1.9"}
 crosup-entity = {version = "0.1.0", path = "../entity"}
-crosup-installers = {path = "../installers", version = "0.1.11"}
+crosup-installers = {path = "../installers", version = "0.1.12"}
 crosup-migration = {path = "../migration", version = "0.1.0"}
 crosup-nix = {path = "../nix", version = "0.1.1"}
 crosup-repo = {path = "../repo", version = "0.1.0"}
 crosup-ssh = {path = "../ssh", version = "0.1.0"}
 crosup-tui = {path = "../tui", version = "0.1.0"}
-crosup-types = {path = "../types", version = "0.1.7"}
+crosup-types = {path = "../types", version = "0.1.8"}
 hcl-rs = "0.14.2"
 inquire = "0.6.2"
 owo-colors = "3.5.0"

crates/core/Cargo.toml

@@ -7,16 +7,16 @@ keywords = ["chromebook", "chromeos", "homebrew", "docker", "nix"]
 license = "MIT"
 name = "crosup-core"
 repository = "https://github.com/tsirysndr/crosup"
-version = "0.1.8"
+version = "0.1.9"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.71"
-crosup-installers = {path = "../installers", version = "0.1.11"}
+crosup-installers = {path = "../installers", version = "0.1.12"}
 crosup-macros = {path = "../macros", version = "0.1.3"}
 crosup-ssh = {path = "../ssh", version = "0.1.0"}
-crosup-types = {path = "../types", version = "0.1.7"}
+crosup-types = {path = "../types", version = "0.1.8"}
 hcl-rs = "0.14.2"
 os-release = "0.1.0"
 owo-colors = "3.5.0"

crates/installers/Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["chromebook", "chromeos", "homebrew", "docker", "nix"]
 license = "MIT"
 name = "crosup-installers"
 repository = "https://github.com/tsirysndr/crosup"
-version = "0.1.11"
+version = "0.1.12"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,7 +16,7 @@ anyhow = "1.0.71"
 crosup-macros = {path = "../macros", version = "0.1.5"}
 crosup-nix = {path = "../nix", version = "0.1.1"}
 crosup-ssh = {path = "../ssh", version = "0.1.0"}
-crosup-types = {path = "../types", version = "0.1.7"}
+crosup-types = {path = "../types", version = "0.1.8"}
 indexmap = {version = "1.9.3", features = ["serde"]}
 owo-colors = "3.5.0"
 ssh2 = {version = "0.9.4", features = ["vendored-openssl"]}

crates/types/Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["chromebook", "chromeos", "homebrew", "docker", "nix"]
 license = "MIT"
 name = "crosup-types"
 repository = "https://github.com/tsirysndr/crosup"
-version = "0.1.7"
+version = "0.1.8"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

crates/types/src/brew.rs

@@ -1,4 +1,5 @@
 use indexmap::IndexMap;
+use os_release::OsRelease;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
@@ -30,24 +31,39 @@ pub struct Package {
 pub fn default_brew_install() -> IndexMap<String, BrewConfiguration> {
     let mut brew = IndexMap::new();
     let mut pkg = IndexMap::new();
-    pkg.insert(
-        "minikube".into(),
-        super::brew::Package {
-            name: "minikube".into(),
-            preinstall: Some(
-                "sudo apt-get install -y qemu-system libvirt-clients libvirt-daemon-system".into(),
-            ),
-            postinstall: Some(
-                r#"sudo sed -i 's/#user = "root"/user = "root"/g' /etc/libvirt/qemu.conf
-sudo sed -i 's/#group = "root"/group = "root"/g' /etc/libvirt/qemu.conf
-sudo sed -i 's/#dynamic_ownership = 1/dynamic_ownership = 0/g' /etc/libvirt/qemu.conf
-sudo sed -i 's/#remember_owner = 1/remember_owner = 0/g' /etc/libvirt/qemu.conf"#
-                    .into(),
-            ),
-            version_check: Some("minikube version".into()),
-            ..Default::default()
-        },
-    );
+    let mut minikube = super::brew::Package {
+        name: "minikube".into(),
+        preinstall: None,
+        postinstall: None,
+        version_check: Some("minikube version".into()),
+        ..Default::default()
+    };
+
+    if cfg!(target_os = "linux") {
+        // determine linux distribution using os-release
+        if let Ok(os_release) = OsRelease::new() {
+            let os = os_release.id.to_lowercase();
+            let os = os.as_str();
+            match os {
+                "ubuntu" | "debian" | "linuxmint" | "pop" | "elementary" | "zorin" => {
+                    minikube.preinstall = Some(
+                        "sudo apt-get install -y qemu-system libvirt-clients libvirt-daemon-system"
+                            .into(),
+                    );
+                    minikube.postinstall = Some(
+                        r#"sudo sed -i 's/#user = "root"/user = "root"/g' /etc/libvirt/qemu.conf
+            sudo sed -i 's/#group = "root"/group = "root"/g' /etc/libvirt/qemu.conf
+            sudo sed -i 's/#dynamic_ownership = 1/dynamic_ownership = 0/g' /etc/libvirt/qemu.conf
+            sudo sed -i 's/#remember_owner = 1/remember_owner = 0/g' /etc/libvirt/qemu.conf"#
+                            .into(),
+                    );
+                }
+                _ => {}
+            }
+        }
+    }
+
+    pkg.insert("minikube".into(), minikube);
 
     pkg.insert(
         "tilt".into(),

flake.nix

@@ -40,7 +40,7 @@
           inherit src;
 
           pname = "crosup";
-          version = "0.4.9";
+          version = "0.4.10";
           cargoExtraArgs = "--package=crosup";
 
           buildInputs = [