Pacman-contrib

Download

pacman-contrib@lists.archlinux.org

February 2018

4 participants
12 discussions

[pacman-contrib] [GIT] branch master updated (7387d68 -> 28e29dd)
by demize＠archlinux.org 14 Feb '18

14 Feb '18

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 7387d68 src/Makefile.am: Add missing backslash new 28e29dd Migrate scripts from manual parsing of pacman.conf, to use of pacman-conf The 1 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: * 28e29dd (HEAD -> master) Migrate scripts from manual parsing of pacman.conf, to use of pacman-conf Detailed log of new commits: commit 28e29ddfdc4c788842ba010b3660bd21575a99bd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 14 11:54:44 2018 -0500 Migrate scripts from manual parsing of pacman.conf, to use of pacman-conf pacman.conf cannot be properly parsed in bash, e.g. it fails to handle `Include = ` directives, hence why pacman introduced a configuration parsing tool in the first place. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Message-Id: <20180214165444.1519-1-eschwartz(a)archlinux.org> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: src/checkupdates.sh.in | 2 +- src/paccache.sh.in | 17 +---------------- src/pacdiff.sh.in | 4 +--- 3 files changed, 3 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [PATCH] Migrate scripts from manual parsing of pacman.conf, to use of pacman-conf
by Eli Schwartz 14 Feb '18

14 Feb '18

pacman.conf cannot be properly parsed in bash, e.g. it fails to handle `Include = ` directives, hence why pacman introduced a configuration parsing tool in the first place. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- src/checkupdates.sh.in | 2 +- src/paccache.sh.in | 3 +-- src/pacdiff.sh.in | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/checkupdates.sh.in b/src/checkupdates.sh.in index 9f34dc1..1d01fda 100644 --- a/src/checkupdates.sh.in +++ b/src/checkupdates.sh.in @@ -46,7 +46,7 @@ fi trap 'rm -f $CHECKUPDATES_DB/db.lck' INT TERM EXIT -DBPath="$(awk -F' *= *' '/^DBPath/ { print $2 }' @sysconfdir@/pacman.conf)" +DBPath="$(pacman-conf DBPath)" if [[ -z "$DBPath" ]] || [[ ! -d "$DBPath" ]]; then DBPath="@localstatedir@/lib/pacman/" fi diff --git a/src/paccache.sh.in b/src/paccache.sh.in index 143c6e3..25432d4 100644 --- a/src/paccache.sh.in +++ b/src/paccache.sh.in @@ -287,8 +287,7 @@ m4_include(../lib/term_colors.sh) # setting default cachedirs if [[ -z $cachedirs ]]; then - cachedir="$(get_cachedirs_from_config "@sysconfdir@/pacman.conf")" - cachedirs=("${cachedirs[@]:-@localstatedir@/cache/pacman/pkg}") + cachedirs=($(pacman-conf CacheDirs)) fi # remaining args are a whitelist diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index ef385c2..866932d 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -130,12 +130,10 @@ case $(( USE_FIND + USE_LOCATE + USE_PACDB )) in esac if (( USE_PACDB )); then - if [[ ! -r @sysconfdir@/pacman.conf ]]; then + if ! DBPath="$(pacman-conf DBPath)"; then error "unable to read @sysconfdir@/pacman.conf" usage; exit 1 fi - - eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) pac_db="${DBPath:-@localstatedir@/lib/pacman/}local" if [[ ! -d "${pac_db}" ]]; then error "unable to read pacman database %s". "${pac_db}" -- 2.16.1

2 2