diff --git a/data/amd_list b/data/amd_list.txt similarity index 100% rename from data/amd_list rename to data/amd_list.txt diff --git a/data/common_list b/data/common_list.txt similarity index 100% rename from data/common_list rename to data/common_list.txt diff --git a/data/firmware_list b/data/firmware_list.txt similarity index 100% rename from data/firmware_list rename to data/firmware_list.txt diff --git a/data/gnome_extra_list b/data/gnome_extra_list.txt similarity index 100% rename from data/gnome_extra_list rename to data/gnome_extra_list.txt diff --git a/data/intel_list b/data/intel_list.txt similarity index 100% rename from data/intel_list rename to data/intel_list.txt diff --git a/data/user_groups b/data/user_groups.txt similarity index 100% rename from data/user_groups rename to data/user_groups.txt diff --git a/src/main.rs b/src/main.rs index 4f2a201..8596d71 100644 --- a/src/main.rs +++ b/src/main.rs @@ -56,8 +56,7 @@ fn add_user_to_groups(add_user_command: AddUserToGroupsCommand) -> Result<()> { log::info!("No user specified, using current user"); whoami::username() }); - log::info!("Adding user {} to groups...", user); - let groups = include_str!("../data/user_groups").to_string(); + let groups = include_str!("../data/user_groups.txt").to_string(); let groups = groups .lines() @@ -204,11 +203,11 @@ fn install_rpm_fusion() -> Result<()> { fn manage_package(package_command: PackageCommand) -> Result<()> { let list = match &package_command.command { - PackageSubCommand::CommonList => include_str!("../data/common_list").to_string(), - PackageSubCommand::AmdList => include_str!("../data/amd_list").to_string(), - PackageSubCommand::IntelList => include_str!("../data/intel_list").to_string(), - PackageSubCommand::GnomeExtraList => include_str!("../data/gnome_extra_list").to_string(), - PackageSubCommand::FirmwareList => include_str!("../data/firmware_list").to_string(), + PackageSubCommand::CommonList => include_str!("../data/common_list.txt").to_string(), + PackageSubCommand::AmdList => include_str!("../data/amd_list.txt").to_string(), + PackageSubCommand::IntelList => include_str!("../data/intel_list.txt").to_string(), + PackageSubCommand::GnomeExtraList => include_str!("../data/gnome_extra_list.txt").to_string(), + PackageSubCommand::FirmwareList => include_str!("../data/firmware_list.txt").to_string(), PackageSubCommand::CustomList(custom_list_command) => { log::info!("Using custom list from {}", custom_list_command.file); read_file!(&custom_list_command.file)?