Merge pull request #20 from wizard-28/rem/mainline

rem!: remove `mainline` flag

Author: ajstrongdev

src/cli.rs

@@ -37,7 +37,7 @@ pub enum Commands {
 #[clap(group(
     ArgGroup::new("operations")
         .multiple(true)
-        .args(&["mainline", "pacstall", "snapdpurge"]),
+        .args(&["pacstall", "snapdpurge"]),
 ))]
 pub struct EnableCommand {
     /// Run interactively
@@ -50,14 +50,6 @@ pub struct EnableCommand {
     #[clap(short, long)]
     pub interactive: bool,
 
-    /// Enable the latest Linux mainline kernel
-    ///
-    /// The latest kernel can be enabled via the rhino-config enable command.
-    /// This will download, install and keep the latest Linux kernel updated
-    /// via the Ubuntu mainline repositories
-    #[clap(short, long)]
-    pub mainline: bool,
-
     /// Enable Pacstall, an additional AUR-like package manager for Ubuntu
     ///
     /// Pacstall can be enabled via the rhino-config enable command. This will
@@ -81,17 +73,9 @@ pub struct EnableCommand {
             ArgGroup::new("operations")
                 .required(true)
                 .multiple(true)
-                .args(&["mainline", "pacstall", "snapdpurge"]),
+                .args(&["pacstall", "snapdpurge"]),
         ))]
 pub struct DisableCommand {
-    /// Disable the latest Linux mainline kernel
-    ///
-    /// This disables the mainline kernel from being continually updated. If it
-    /// was enabled then it will still be installed on your system, however you
-    /// can revert to the kernel provided by Ubuntu in your grub menu
-    #[clap(short, long)]
-    pub mainline: bool,
-
     /// Disable Pacstall, an additional AUR-like package manager for Ubuntu
     ///
     /// This disables and uninstalls Pacstall from your system. Pacstall will

src/commands/disable.rs

@@ -4,12 +4,6 @@ use std::process::Command;
 
 use anyhow::{ensure, Context, Result};
 
-pub fn mainline(config_path: &Path) -> Result<()> {
-    fs::remove_file(&config_path).context("Unable to remove mainline config file!")?;
-    println!("Mainline kernel has been disabled.");
-
-    Ok(())
-}
 pub fn pacstall(config_path: &Path) -> Result<()> {
     fs::remove_file(&config_path).context("Unable to remove pacstall config file!")?;
     println!("Pacstall has been disabled.");
@@ -79,18 +73,6 @@ mod tests {
     #[fixture]
     fn temp_dir() -> TempDir { tempdir().unwrap() }
 
-    #[rstest]
-    fn test_mainline(temp_dir: TempDir) -> Result<(), Box<dyn Error>> {
-        let config_path = temp_dir.path().join("mainline");
-        File::create(&config_path)?;
-
-        super::mainline(&config_path)?;
-        // Test that the config file is deleted
-        assert!(!config_path.exists());
-
-        Ok(())
-    }
-
     #[rstest]
     fn test_pacstall(temp_dir: TempDir) -> Result<(), Box<dyn Error>> {
         let config_path = temp_dir.path().join("pacstall");

src/commands/enable.rs

@@ -5,14 +5,6 @@ use std::process::Command;
 use anyhow::{ensure, Context, Result};
 use indoc::indoc;
 
-pub fn mainline(config_path: &Path) -> Result<()> {
-    File::create(config_path).context("Failed to create the mainline config file!")?;
-    println!(
-        r#"The mainline kernel has been enabled - please run "rhino-update" to update your system."#
-    );
-    Ok(())
-}
-
 pub fn pacstall(config_path: &Path) -> Result<()> {
     File::create(config_path).context("Unable to create pacstall config!")?;
 
@@ -88,17 +80,6 @@ mod tests {
     #[fixture]
     fn temp_dir() -> TempDir { tempdir().unwrap() }
 
-    #[rstest]
-    fn test_mainline(temp_dir: TempDir) -> Result<(), Box<dyn Error>> {
-        let config_path = temp_dir.path().join("mainline");
-
-        super::mainline(&config_path)?;
-        // Test that the config file is created
-        assert!(config_path.exists());
-
-        Ok(())
-    }
-
     #[rstest]
     fn test_pacstall(temp_dir: TempDir) -> Result<(), Box<dyn Error>> {
         let config_path = temp_dir.path().join("pacstall");

src/main.rs

@@ -51,25 +51,13 @@ fn main() -> Result<()> {
     fs::create_dir_all(&config_path).context("Failed to create config directory!")?;
 
     let pacstall_config_path = config_path.join("pacstall");
-    let mainline_config_path = config_path.join("mainline");
 
     let snapdpurge_config_path = config_path.join("snapdpurge");
     let snapdpurge_snap_path = home_path.join("snap/");
 
     match &cli.command {
         Commands::Enable(flag) => {
             if flag.interactive {
-                if !mainline_config_path.exists() {
-                    if ask("Do you wish to install the Linux mainline kernel?") {
-                        enable::mainline(&mainline_config_path)?;
-                    } else {
-                        println!(
-                            "No changes were made to the Rhino configuration, the mainline kernel \
-                             will not be installed."
-                        );
-                    }
-                }
-
                 if !snapdpurge_config_path.exists() {
                     if ask("Do you wish to remove Snapcraft (snapd) and replace it with Flatpak?") {
                         enable::snapdpurge(&snapdpurge_config_path, &snapdpurge_snap_path)?;
@@ -96,14 +84,6 @@ fn main() -> Result<()> {
                 }
             }
 
-            if flag.mainline {
-                ensure!(
-                    !mainline_config_path.exists(),
-                    "Mainine kernel is already enabled!"
-                );
-                enable::mainline(&mainline_config_path)?;
-            }
-
             if flag.snapdpurge {
                 ensure!(
                     !snapdpurge_config_path.exists(),
@@ -123,15 +103,6 @@ fn main() -> Result<()> {
             Ok(())
         },
         Commands::Disable(flag) => {
-            if flag.mainline {
-                ensure!(
-                    mainline_config_path.exists(),
-                    "Mainline kernel is already disabled!"
-                );
-
-                disable::mainline(&mainline_config_path)?;
-            }
-
             if flag.snapdpurge {
                 ensure!(
                     snapdpurge_config_path.exists(),