Add a flag to disable showing Arch Linux news (fix #786)
This commit is contained in:
@@ -67,6 +67,7 @@
|
|||||||
#arch_package_manager = "pacman"
|
#arch_package_manager = "pacman"
|
||||||
# Arguments to pass yay (or paru) when updating packages
|
# Arguments to pass yay (or paru) when updating packages
|
||||||
#yay_arguments = "--nodevel"
|
#yay_arguments = "--nodevel"
|
||||||
|
#show_arch_news = true
|
||||||
#trizen_arguments = "--devel"
|
#trizen_arguments = "--devel"
|
||||||
#enable_tlmgr = true
|
#enable_tlmgr = true
|
||||||
#emerge_sync_flags = "-q"
|
#emerge_sync_flags = "-q"
|
||||||
|
|||||||
@@ -195,6 +195,7 @@ pub enum ArchPackageManager {
|
|||||||
pub struct Linux {
|
pub struct Linux {
|
||||||
yay_arguments: Option<String>,
|
yay_arguments: Option<String>,
|
||||||
arch_package_manager: Option<ArchPackageManager>,
|
arch_package_manager: Option<ArchPackageManager>,
|
||||||
|
show_arch_news: Option<bool>,
|
||||||
trizen_arguments: Option<String>,
|
trizen_arguments: Option<String>,
|
||||||
dnf_arguments: Option<String>,
|
dnf_arguments: Option<String>,
|
||||||
apt_arguments: Option<String>,
|
apt_arguments: Option<String>,
|
||||||
@@ -641,6 +642,16 @@ impl Config {
|
|||||||
.unwrap_or("")
|
.unwrap_or("")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Show news on Arch Linux
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub fn show_arch_news(&self) -> bool {
|
||||||
|
self.config_file
|
||||||
|
.linux
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|s| s.show_arch_news)
|
||||||
|
.unwrap_or(true)
|
||||||
|
}
|
||||||
|
|
||||||
/// Extra yay arguments
|
/// Extra yay arguments
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub fn arch_package_manager(&self) -> ArchPackageManager {
|
pub fn arch_package_manager(&self) -> ArchPackageManager {
|
||||||
|
|||||||
@@ -25,11 +25,13 @@ pub struct YayParu {
|
|||||||
|
|
||||||
impl ArchPackageManager for YayParu {
|
impl ArchPackageManager for YayParu {
|
||||||
fn upgrade(&self, ctx: &ExecutionContext) -> Result<()> {
|
fn upgrade(&self, ctx: &ExecutionContext) -> Result<()> {
|
||||||
|
if ctx.config().show_arch_news() {
|
||||||
Command::new(&self.executable)
|
Command::new(&self.executable)
|
||||||
.arg("-Pw")
|
.arg("-Pw")
|
||||||
.spawn()
|
.spawn()
|
||||||
.and_then(|mut p| p.wait())
|
.and_then(|mut p| p.wait())
|
||||||
.ok();
|
.ok();
|
||||||
|
}
|
||||||
|
|
||||||
let mut command = ctx.run_type().execute(&self.executable);
|
let mut command = ctx.run_type().execute(&self.executable);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user