From 897b3094d8274098317d513a4fc796f0859f06fc Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Mon, 25 Oct 2021 22:53:53 +0300
Subject: [PATCH] Move pacnew to the correct location

---
 src/steps/os/archlinux.rs | 22 ++++++++++++++++++++++
 src/steps/os/linux.rs     | 24 +-----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/steps/os/archlinux.rs b/src/steps/os/archlinux.rs
index 84fd7a9b..ed2ae244 100644
--- a/src/steps/os/archlinux.rs
+++ b/src/steps/os/archlinux.rs
@@ -6,6 +6,7 @@ use std::env::var_os;
 use std::ffi::OsString;
 use std::path::{Path, PathBuf};
 use std::process::Command;
+use walkdir::WalkDir;
 
 fn get_execution_path() -> OsString {
     let mut path = OsString::from("/usr/bin:");
@@ -171,3 +172,24 @@ pub fn upgrade_arch_linux(ctx: &ExecutionContext) -> Result<()> {
     let package_manager = get_arch_package_manager(ctx).unwrap();
     package_manager.upgrade(ctx)
 }
+
+pub fn show_pacnew() {
+    let mut iter = WalkDir::new("/etc")
+        .into_iter()
+        .filter_map(Result::ok)
+        .filter(|f| {
+            f.path()
+                .extension()
+                .filter(|ext| ext == &"pacnew" || ext == &"pacsave")
+                .is_some()
+        })
+        .peekable();
+
+    if iter.peek().is_some() {
+        println!("\nPacman backup configuration files found:");
+
+        for entry in iter {
+            println!("{}", entry.path().display());
+        }
+    }
+}
diff --git a/src/steps/os/linux.rs b/src/steps/os/linux.rs
index 2f797b0c..4beb5d90 100644
--- a/src/steps/os/linux.rs
+++ b/src/steps/os/linux.rs
@@ -10,7 +10,6 @@ use log::debug;
 use serde::Deserialize;
 use std::path::{Path, PathBuf};
 use std::process::Command;
-use walkdir::WalkDir;
 
 static OS_RELEASE_PATH: &str = "/etc/os-release";
 
@@ -110,7 +109,7 @@ impl Distribution {
 
     pub fn show_summary(self) {
         if let Distribution::Arch = self {
-            show_pacnew();
+            archlinux::show_pacnew();
         }
     }
 
@@ -125,27 +124,6 @@ fn is_wsl() -> Result<bool> {
     Ok(output.contains("microsoft"))
 }
 
-pub fn show_pacnew() {
-    let mut iter = WalkDir::new("/etc")
-        .into_iter()
-        .filter_map(Result::ok)
-        .filter(|f| {
-            f.path()
-                .extension()
-                .filter(|ext| ext == &"pacnew" || ext == &"pacsave")
-                .is_some()
-        })
-        .peekable();
-
-    if iter.peek().is_some() {
-        println!("\nPacman backup configuration files found:");
-
-        for entry in iter {
-            println!("{}", entry.path().display());
-        }
-    }
-}
-
 fn upgrade_alpine_linux(ctx: &ExecutionContext) -> Result<()> {
     let apk = require("apk")?;
     let sudo = ctx.sudo().as_ref().unwrap();