February 2021 - Pacman-contrib - lists.archlinux.org

[PATCH] pacdiff: Add option to use sudo/sudoedit to manage files
by Daniel Parks 28 Mar '21

28 Mar '21

This allows the user to run their diff program as their own user instead of root. The advantage of this approach is that they can use their own configuration for the editor or even use a GUI merge program such as meld. --- src/pacdiff.sh.in | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index c4dbd89..aac88c8 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -28,6 +28,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diffprog=${DIFFPROG:-'vim -d'} diffsearchpath=${DIFFSEARCHPATH:-/etc} USE_COLOR='y' +SUDO='' declare -a oldsaves declare -i USE_FIND=0 USE_LOCATE=0 USE_PACDB=0 OUTPUTONLY=0 @@ -50,6 +51,7 @@ Search Options: select one (default: --pacmandb) General Options: -o/--output print files instead of merging them --nocolor remove colors from output + -s/--sudo use sudo to merge/remove files Environment Variables: DIFFPROG override the merge program: (default: 'vim -d') @@ -109,6 +111,8 @@ while [[ -n "$1" ]]; do OUTPUTONLY=1;; --nocolor) USE_COLOR='n';; + -s|--sudo) + SUDO=sudo;; -V|--version) version; exit 0;; -h|--help) @@ -168,25 +172,29 @@ while IFS= read -u 3 -r -d '' pacfile; do msg "%s file found for %s" "$file_type" "$file" if [ ! -f "$file" ]; then warning "$file does not exist" - rm -iv "$pacfile" + $SUDO rm -iv "$pacfile" continue fi if cmp -s "$pacfile" "$file"; then msg2 "Files are identical, removing..." - rm -v "$pacfile" + $SUDO rm -v "$pacfile" else ask "(V)iew, (S)kip, (R)emove %s, (O)verwrite with %s, (Q)uit: [v/s/r/o/q] " "$file_type" "$file_type" while read c; do case $c in q|Q) exit 0;; - r|R) rm -v "$pacfile"; break ;; - o|O) mv -v "$pacfile" "$file"; break ;; + r|R) $SUDO rm -v "$pacfile"; break ;; + o|O) $SUDO mv -v "$pacfile" "$file"; break ;; v|V) - $diffprog "$pacfile" "$file" + if [[ -n "$SUDO" ]]; then + SUDO_EDITOR="$diffprog" sudoedit "$pacfile" "$file" + else + $diffprog "$pacfile" "$file" + fi if cmp -s "$pacfile" "$file"; then msg2 "Files are identical, removing..." - rm -v "$pacfile" + $SUDO rm -v "$pacfile" break fi ask "(V)iew, (S)kip, (R)emove %s, (O)verwrite with %s, (Q)uit: [v/s/r/o/q] " "$file_type" "$file_type"; -- 2.30.1

2 4

[PATCH 0/4] pacdiff: learn (M)erge mode
by Denton Liu 28 Mar '21

28 Mar '21

This series teaches pacdiff to perform 3-way merges on config files. The first commit is a cleanup that should be done regardless of whether the rest of this series is merged. The next two commits are small refactors to make final change more readable. The last patch implements the bulk of the logic. It also includes some comment requests. Denton Liu (4): pacdiff: Reindent awk script pacdiff: Implement die() pacdiff: Reduce repetition in input loop pacdiff: Learn the (M)erge mode doc/pacdiff.8.txt | 9 +++- src/pacdiff.sh.in | 102 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 97 insertions(+), 14 deletions(-) -- 2.29.2.889.g5298b911bd

2 9

[GIT] branch master updated (ca89bb6 -> e092561)
by Daniel M. Capella 08 Feb '21

08 Feb '21

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from ca89bb6 checkupdates: Do not use sudo when run as root new e4c3a57 pacsort.8.txt: add missing colon new e092561 pacdiff: Reindent awk script The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * e092561 (HEAD -> master) pacdiff: Reindent awk script * e4c3a57 pacsort.8.txt: add missing colon Detailed log of new commits: commit e092561f096f4bf2d98a6378c6951dc22c118f23 Author: Denton Liu <liu.denton(a)gmail.com> Date: Fri Dec 25 23:27:17 2020 -0800 pacdiff: Reindent awk script The way that the awk script used for fetching files from the pacdb is indented is very misleading. It appears as if the `print $1` is part of the if. Unindent the `print $1` and the following closing brace so that it's obvious that they are part of the while. Signed-off-by: Denton Liu <liu.denton(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> commit e4c3a57899c7b52a130962378dbc49004da47dca Author: Denton Liu <liu.denton(a)gmail.com> Date: Fri Dec 25 03:23:50 2020 -0800 pacsort.8.txt: add missing colon There is a missing colon so, as a result, the following line is rendered incorrectly as -v, --version: Display the version. instead of -v, --version Display the version. Add the missing colon so that it renders properly. Signed-off-by: Denton Liu <liu.denton(a)gmail.com> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Summary of changes: doc/pacsort.8.txt | 2 +- src/pacdiff.sh.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

Ping for two patchsets
by Denton Liu 02 Feb '21

02 Feb '21

Hello, Following up on two patchsets[0][1] I sent a couple of months ago since the list has been dead since. If the maintainers are not too busy currently, I'd appreciate a review. Have a great day, Denton [0]: https://lists.archlinux.org/pipermail/pacman-contrib/2020-December/000330.h… [1]: https://lists.archlinux.org/pipermail/pacman-contrib/2020-December/000331.h…

2 1