axtloss/rework-partitioning
axtloss 2 years ago
parent c9a812a614
commit ae881c5bac

@ -238,7 +238,6 @@ pub struct NewUserArgs {
pub enum DesktopSetup { pub enum DesktopSetup {
//#[clap(name = "onyx")] //#[clap(name = "onyx")]
//Onyx, //Onyx,
#[clap(name = "gnome")] #[clap(name = "gnome")]
Gnome, Gnome,

@ -5,7 +5,7 @@ use crate::internal::*;
pub fn install_desktop_setup(desktop_setup: DesktopSetup) { pub fn install_desktop_setup(desktop_setup: DesktopSetup) {
log::debug!("Installing {:?}", desktop_setup); log::debug!("Installing {:?}", desktop_setup);
match desktop_setup { match desktop_setup {
// DesktopSetup::Onyx => install_onyx(), // DesktopSetup::Onyx => install_onyx(),
DesktopSetup::Gnome => install_gnome(), DesktopSetup::Gnome => install_gnome(),
DesktopSetup::Kde => install_kde(), DesktopSetup::Kde => install_kde(),
DesktopSetup::Budgie => install_budgie(), DesktopSetup::Budgie => install_budgie(),

@ -95,4 +95,3 @@ pub fn root_pass(root_pass: &str) {
"set root password", "set root password",
); );
} }

@ -158,7 +158,7 @@ pub fn read_config(configpath: PathBuf) {
desktops::install_desktop_setup(*desktop); desktops::install_desktop_setup(*desktop);
}*/ }*/
match config.desktop.as_str() { match config.desktop.as_str() {
// "onyx" => desktops::install_desktop_setup(DesktopSetup::Onyx), // "onyx" => desktops::install_desktop_setup(DesktopSetup::Onyx),
"plasma" => desktops::install_desktop_setup(DesktopSetup::Kde), "plasma" => desktops::install_desktop_setup(DesktopSetup::Kde),
"mate" => desktops::install_desktop_setup(DesktopSetup::Mate), "mate" => desktops::install_desktop_setup(DesktopSetup::Mate),
"gnome" => desktops::install_desktop_setup(DesktopSetup::Gnome), "gnome" => desktops::install_desktop_setup(DesktopSetup::Gnome),

@ -1,5 +1,5 @@
use crate::internal::*;
use crate::functions::partition::umount; use crate::functions::partition::umount;
use crate::internal::*;
use std::process::Command; use std::process::Command;
pub fn install(pkgs: Vec<&str>) { pub fn install(pkgs: Vec<&str>) {

@ -53,7 +53,13 @@ fn main() {
} }
Command::Users { subcommand } => match subcommand { Command::Users { subcommand } => match subcommand {
UsersSubcommand::NewUser(args) => { UsersSubcommand::NewUser(args) => {
users::new_user(&args.username, args.hasroot, &args.password, true, &args.shell); users::new_user(
&args.username,
args.hasroot,
&args.password,
true,
&args.shell,
);
} }
UsersSubcommand::RootPass { password } => { UsersSubcommand::RootPass { password } => {
users::root_pass(&password); users::root_pass(&password);

Loading…
Cancel
Save