From 82dbf9530d1479dd0b7ae571a5fb379d367d7adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Sat, 5 Feb 2022 00:27:10 +0000 Subject: [PATCH] Update pacnew meld --- docs/Howtos/HowtoSysadmin.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/Howtos/HowtoSysadmin.md b/docs/Howtos/HowtoSysadmin.md index 7b6c5e8..978590a 100644 --- a/docs/Howtos/HowtoSysadmin.md +++ b/docs/Howtos/HowtoSysadmin.md @@ -3,7 +3,8 @@ Archlinux merge new config files: ```console -for i in $(find /etc -regextype posix-extended -regex ".+\.pac(new|save)" 2> /dev/null); do sudo rm $i ${i%%.pacnew}; done +for i in $(find /etc -iname '*.pacnew'); do sudo meld $i ${i%%.pacnew} && rm -i $i; done +for i in $(find /etc -iname '*.pacsave'); do sudo meld $i ${i%%.pacsave} && rm -i $i; done ``` Get Github or Gitlab user key: