Pacman-contrib

Download

pacman-contrib@lists.archlinux.org

December 2019

4 participants
12 discussions

[[PATCH] vim: add validpgpkeys to valid vim syntax for PKGBUILD's
by Jelle van der Waa 14 Dec '19

14 Dec '19

From: Jelle van der Waa <jelle(a)vdwaa.nl> Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- src/vim/syntax/PKGBUILD.vim | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/vim/syntax/PKGBUILD.vim b/src/vim/syntax/PKGBUILD.vim index 781cd9d..070161a 100644 --- a/src/vim/syntax/PKGBUILD.vim +++ b/src/vim/syntax/PKGBUILD.vim @@ -227,6 +227,11 @@ hi def link pbB2Quotes Keyword hi def link pbB2Hash Error hi def link pbValidB2sums Number +" validpgpkeys +syn keyword pb_k_validpgpkeys validpgpkeys contained +syn match pbValidPGPKeys /$[[:alnum:]]$*/ contained +syn region pbValidPGPKeysGroup start=/^validpgpkeys=(/ end=/)/ contains=pb_k_validpgpkeys,pbValidPGPKeys,shDoubleQuote,shSingleQuote + " options syn keyword pb_k_options options contained syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|purge\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags$/ contained @@ -303,6 +308,8 @@ hi def link pb_k_changelog pbKeywords hi def link pb_k_source pbKeywords hi def link pbIllegalSource Error +hi def link pb_k_validpgpkeys pbKeywords + hi def link pb_k_md5sums pbKeywords hi def link pbIllegalMd5sums Error -- 2.24.0

2 1

[PATCH] checkupdates: use $UID in temporary directory path if $USER is not set
by nl6720 14 Dec '19

14 Dec '19

If $USER is not set when running checkupdates, the temporary directory's name will be "checkup-db-". This will cause issues if multiple users run checkupdates. A common situation where $USER is not set is when a command is executed with systemd-run, e.g. from a systemd unit. See https://github.com/systemd/systemd/pull/8227 for details. Fall back to $UID so that the temporary directory is isolated per-user. Signed-off-by: nl6720 <nl6720(a)gmail.com> --- src/checkupdates.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/checkupdates.sh.in b/src/checkupdates.sh.in index 52f8899..f2c468c 100644 --- a/src/checkupdates.sh.in +++ b/src/checkupdates.sh.in @@ -85,7 +85,7 @@ if ! type -P fakeroot >/dev/null; then fi if [[ -z $CHECKUPDATES_DB ]]; then - CHECKUPDATES_DB="${TMPDIR:-/tmp}/checkup-db-${USER}/" + CHECKUPDATES_DB="${TMPDIR:-/tmp}/checkup-db-${USER:-$UID}/" fi trap 'rm -f $CHECKUPDATES_DB/db.lck' INT TERM EXIT -- 2.24.0

3 3