[pacman-dev] [PATCH] contrib/PKGBUILD.vim: handle arch suffixes with keywords
From: Daniel Hahler <git@thequod.de> --- contrib/PKGBUILD.vim | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 35ca6bd..8a9f411 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -93,37 +93,37 @@ syn match pbValidGroups /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbGroupsGroup start=/^groups=(/ end=/)/ contains=pb_k_groups,pbValidGroups,shDoubleQuote,shSingleQuote " depends -syn keyword pb_k_depends depends contained +syn keyword pb_k_depends depends depends_i686 depends_x86_64 contained syn match pbValidDepends /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbDependsGroup start=/^depends=(/ end=/)/ contains=pb_k_depends,pbValidDepends,shDoubleQuote,shSingleQuote " makedepends -syn keyword pb_k_makedepends makedepends contained +syn keyword pb_k_makedepends makedepends makedepends_i686 makedepends_x86_64 contained syn match pbValidMakedepends /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbMakedependsGroup start=/^makedepends=(/ end=/)/ contains=pb_k_makedepends,pbValidMakedepends,shDoubleQuote,shSingleQuote " optdepends -syn keyword pb_k_optdepends optdepends contained +syn keyword pb_k_optdepends optdepends optdepends_i686 optdepends_x86_64 contained syn match pbValidOptdepends /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbOptdependsGroup start=/^optdepends=(/ end=/)/ contains=pb_k_optdepends,pbValidOptdepends,shDoubleQuote,shSingleQuote " checkdepends -syn keyword pb_k_ckdepends checkdepends contained +syn keyword pb_k_ckdepends checkdepends checkdepends_i686 checkdepends_x86_64 contained syn match pbValidCkdepends /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbCkdependsGroup start=/^checkdepends=(/ end=/)/ contains=pb_k_ckdepends,pbValidCkdepends,shDoubleQuote,shSingleQuote " conflicts -syn keyword pb_k_conflicts conflicts contained +syn keyword pb_k_conflicts conflicts conflicts_i686 conflicts_x86_64 contained syn match pbValidConflicts /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbConflictsGroup start=/^conflicts=(/ end=/)/ contains=pb_k_conflicts,pbValidConflicts,shDoubleQuote,shSingleQuote " provides -syn keyword pb_k_provides provides contained +syn keyword pb_k_provides provides provides_i686 provides_x86_64 contained syn match pbValidProvides /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbProvidesGroup start=/^provides=(/ end=/)/ contains=pb_k_provides,pbValidProvides,shDoubleQuote,shSingleQuote " replaces -syn keyword pb_k_replaces replaces contained +syn keyword pb_k_replaces replaces replaces_i686 replaces_x86_64 contained syn match pbValidReplaces /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbReplacesGroup start=/^replaces=(/ end=/)/ contains=pb_k_replaces,pbValidReplaces,shDoubleQuote,shSingleQuote @@ -148,14 +148,14 @@ syn match pbChangelogGroup /^changelog=.*/ contains=pb_k_changelog,pbValidChange syn clear shStatement syn keyword shStatement xxx wait getopts return autoload whence printf true popd nohup enable r trap readonly fc fg kill ulimit umask disown stop pushd read history logout times local exit test pwd time eval integer suspend dirs shopt hash false newgrp bg print jobs continue functions exec help cd break unalias chdir type shift builtin let bind -syn keyword pb_k_source source contained +syn keyword pb_k_source source source_i686 source_x86_64 contained syn match pbIllegalSource /\(http\|ftp\|https\).*\.\+\(dl\|download.\?\)\.\(sourceforge\|sf\).net/ syn region pbSourceGroup start=/^source=(/ end=/)/ contains=pb_k_source,pbIllegalSource,shNumber,shDoubleQuote,shSingleQuote,pbDerefEmulation syn match pbDerefEmulation /\$[{]\?[[:alnum:]_]*[}]\?/ contained hi def link pbDerefEmulation PreProc " md5sums -syn keyword pb_k_md5sums md5sums contained +syn keyword pb_k_md5sums md5sums md5sums_i686 md5sums_x86_64 contained syn match pbIllegalMd5sums /[^='"()\/ ]/ contained contains=pbValidMd5sums syn match pbValidMd5sums /\x\{32\}/ contained syn region pbMd5sumsGroup start=/^md5sums/ end=/)/ contains=pb_k_md5sums,pbMd5Quotes,pbMd5Hash,pbIllegalMd5sums keepend @@ -166,7 +166,7 @@ hi def link pbMd5Hash Error hi def link pbValidMd5sums Number " sha1sums -syn keyword pb_k_sha1sums sha1sums contained +syn keyword pb_k_sha1sums sha1sums sha1sums_i686 sha1sums_x86_64 contained syn match pbIllegalSha1sums /[^='"()\/ ]/ contained contains=pbValidSha1sums syn match pbValidSha1sums /\x\{40\}/ contained syn region pbSha1sumsGroup start=/^sha1sums/ end=/)/ contains=pb_k_sha1sums,pbSha1Quotes,pbSha1Hash,pbIllegalSha1sums keepend @@ -177,7 +177,7 @@ hi def link pbSha1Hash Error hi def link pbValidSha1sums Number " sha256sums -syn keyword pb_k_sha256sums sha256sums contained +syn keyword pb_k_sha256sums sha256sums sha256sums_i686 sha256sums_x86_64 contained syn match pbIllegalSha256sums /[^='"()\/ ]/ contained contains=pbValidSha256sums syn match pbValidSha256sums /\x\{64\}/ contained syn region pbSha256sumsGroup start=/^sha256sums/ end=/)/ contains=pb_k_sha256sums,pbSha256Quotes,pbSha256Hash,pbIllegalSha256sums keepend @@ -188,7 +188,7 @@ hi def link pbSha256Hash Error hi def link pbValidSha256sums Number " sha384sums -syn keyword pb_k_sha384sums sha384sums contained +syn keyword pb_k_sha384sums sha384sums sha384sums_i686 sha384sums_x86_64 contained syn match pbIllegalSha384sums /[^='"()\/ ]/ contained contains=pbValidSha384sums syn match pbValidSha384sums /\x\{96\}/ contained syn region pbSha384sumsGroup start=/^sha384sums/ end=/)/ contains=pb_k_sha384sums,pbSha384Quotes,pbSha384Hash,pbIllegalSha384sums keepend @@ -199,7 +199,7 @@ hi def link pbSha384Hash Error hi def link pbValidSha384sums Number " sha512sums -syn keyword pb_k_sha512sums sha512sums contained +syn keyword pb_k_sha512sums sha512sums sha512sums_i686 sha512sums_x86_64 contained syn match pbIllegalSha512sums /[^='"()\/ ]/ contained contains=pbValidSha512sums syn match pbValidSha512sums /\x\{128\}/ contained syn region pbSha512sumsGroup start=/^sha512sums/ end=/)/ contains=pb_k_sha512sums,pbSha512Quotes,pbSha512Hash,pbIllegalSha512sums keepend -- 2.6.4
From: Daniel Hahler <git@thequod.de> Signed-off-by: Daniel Hahler <git@thequod.de> --- contrib/PKGBUILD.vim | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 35ca6bd..8a9f411 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -93,37 +93,37 @@ syn match pbValidGroups /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbGroupsGroup start=/^groups=(/ end=/)/ contains=pb_k_groups,pbValidGroups,shDoubleQuote,shSingleQuote " depends -syn keyword pb_k_depends depends contained +syn keyword pb_k_depends depends depends_i686 depends_x86_64 contained syn match pbValidDepends /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbDependsGroup start=/^depends=(/ end=/)/ contains=pb_k_depends,pbValidDepends,shDoubleQuote,shSingleQuote " makedepends -syn keyword pb_k_makedepends makedepends contained +syn keyword pb_k_makedepends makedepends makedepends_i686 makedepends_x86_64 contained syn match pbValidMakedepends /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbMakedependsGroup start=/^makedepends=(/ end=/)/ contains=pb_k_makedepends,pbValidMakedepends,shDoubleQuote,shSingleQuote " optdepends -syn keyword pb_k_optdepends optdepends contained +syn keyword pb_k_optdepends optdepends optdepends_i686 optdepends_x86_64 contained syn match pbValidOptdepends /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbOptdependsGroup start=/^optdepends=(/ end=/)/ contains=pb_k_optdepends,pbValidOptdepends,shDoubleQuote,shSingleQuote " checkdepends -syn keyword pb_k_ckdepends checkdepends contained +syn keyword pb_k_ckdepends checkdepends checkdepends_i686 checkdepends_x86_64 contained syn match pbValidCkdepends /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbCkdependsGroup start=/^checkdepends=(/ end=/)/ contains=pb_k_ckdepends,pbValidCkdepends,shDoubleQuote,shSingleQuote " conflicts -syn keyword pb_k_conflicts conflicts contained +syn keyword pb_k_conflicts conflicts conflicts_i686 conflicts_x86_64 contained syn match pbValidConflicts /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbConflictsGroup start=/^conflicts=(/ end=/)/ contains=pb_k_conflicts,pbValidConflicts,shDoubleQuote,shSingleQuote " provides -syn keyword pb_k_provides provides contained +syn keyword pb_k_provides provides provides_i686 provides_x86_64 contained syn match pbValidProvides /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbProvidesGroup start=/^provides=(/ end=/)/ contains=pb_k_provides,pbValidProvides,shDoubleQuote,shSingleQuote " replaces -syn keyword pb_k_replaces replaces contained +syn keyword pb_k_replaces replaces replaces_i686 replaces_x86_64 contained syn match pbValidReplaces /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbReplacesGroup start=/^replaces=(/ end=/)/ contains=pb_k_replaces,pbValidReplaces,shDoubleQuote,shSingleQuote @@ -148,14 +148,14 @@ syn match pbChangelogGroup /^changelog=.*/ contains=pb_k_changelog,pbValidChange syn clear shStatement syn keyword shStatement xxx wait getopts return autoload whence printf true popd nohup enable r trap readonly fc fg kill ulimit umask disown stop pushd read history logout times local exit test pwd time eval integer suspend dirs shopt hash false newgrp bg print jobs continue functions exec help cd break unalias chdir type shift builtin let bind -syn keyword pb_k_source source contained +syn keyword pb_k_source source source_i686 source_x86_64 contained syn match pbIllegalSource /\(http\|ftp\|https\).*\.\+\(dl\|download.\?\)\.\(sourceforge\|sf\).net/ syn region pbSourceGroup start=/^source=(/ end=/)/ contains=pb_k_source,pbIllegalSource,shNumber,shDoubleQuote,shSingleQuote,pbDerefEmulation syn match pbDerefEmulation /\$[{]\?[[:alnum:]_]*[}]\?/ contained hi def link pbDerefEmulation PreProc " md5sums -syn keyword pb_k_md5sums md5sums contained +syn keyword pb_k_md5sums md5sums md5sums_i686 md5sums_x86_64 contained syn match pbIllegalMd5sums /[^='"()\/ ]/ contained contains=pbValidMd5sums syn match pbValidMd5sums /\x\{32\}/ contained syn region pbMd5sumsGroup start=/^md5sums/ end=/)/ contains=pb_k_md5sums,pbMd5Quotes,pbMd5Hash,pbIllegalMd5sums keepend @@ -166,7 +166,7 @@ hi def link pbMd5Hash Error hi def link pbValidMd5sums Number " sha1sums -syn keyword pb_k_sha1sums sha1sums contained +syn keyword pb_k_sha1sums sha1sums sha1sums_i686 sha1sums_x86_64 contained syn match pbIllegalSha1sums /[^='"()\/ ]/ contained contains=pbValidSha1sums syn match pbValidSha1sums /\x\{40\}/ contained syn region pbSha1sumsGroup start=/^sha1sums/ end=/)/ contains=pb_k_sha1sums,pbSha1Quotes,pbSha1Hash,pbIllegalSha1sums keepend @@ -177,7 +177,7 @@ hi def link pbSha1Hash Error hi def link pbValidSha1sums Number " sha256sums -syn keyword pb_k_sha256sums sha256sums contained +syn keyword pb_k_sha256sums sha256sums sha256sums_i686 sha256sums_x86_64 contained syn match pbIllegalSha256sums /[^='"()\/ ]/ contained contains=pbValidSha256sums syn match pbValidSha256sums /\x\{64\}/ contained syn region pbSha256sumsGroup start=/^sha256sums/ end=/)/ contains=pb_k_sha256sums,pbSha256Quotes,pbSha256Hash,pbIllegalSha256sums keepend @@ -188,7 +188,7 @@ hi def link pbSha256Hash Error hi def link pbValidSha256sums Number " sha384sums -syn keyword pb_k_sha384sums sha384sums contained +syn keyword pb_k_sha384sums sha384sums sha384sums_i686 sha384sums_x86_64 contained syn match pbIllegalSha384sums /[^='"()\/ ]/ contained contains=pbValidSha384sums syn match pbValidSha384sums /\x\{96\}/ contained syn region pbSha384sumsGroup start=/^sha384sums/ end=/)/ contains=pb_k_sha384sums,pbSha384Quotes,pbSha384Hash,pbIllegalSha384sums keepend @@ -199,7 +199,7 @@ hi def link pbSha384Hash Error hi def link pbValidSha384sums Number " sha512sums -syn keyword pb_k_sha512sums sha512sums contained +syn keyword pb_k_sha512sums sha512sums sha512sums_i686 sha512sums_x86_64 contained syn match pbIllegalSha512sums /[^='"()\/ ]/ contained contains=pbValidSha512sums syn match pbValidSha512sums /\x\{128\}/ contained syn region pbSha512sumsGroup start=/^sha512sums/ end=/)/ contains=pb_k_sha512sums,pbSha512Quotes,pbSha512Hash,pbIllegalSha512sums keepend -- 2.6.4
On 23/12, genml+pacman-dev@thequod.de wrote:
From: Daniel Hahler <git@thequod.de>
--- contrib/PKGBUILD.vim | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 35ca6bd..8a9f411 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -93,37 +93,37 @@ syn match pbValidGroups /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbGroupsGroup start=/^groups=(/ end=/)/ contains=pb_k_groups,pbValidGroups,shDoubleQuote,shSingleQuote
" depends -syn keyword pb_k_depends depends contained +syn keyword pb_k_depends depends depends_i686 depends_x86_64 contained syn match pbValidDepends /\([[:alnum:]]\|+\|-\|_\)*/ contained syn region pbDependsGroup start=/^depends=(/ end=/)/ contains=pb_k_depends,pbValidDepends,shDoubleQuote,shSingleQuote
Issue is that pacman is distro agnostic, and other distributions support eg ARM. Is there any way to make it match all possible ones without hardcoding them? -- Sincerely, Johannes Löthberg PGP Key ID: 0x50FB9B273A9D0BB5 https://theos.kyriasis.com/~kyrias/
participants (2)
-
genml+pacman-dev@thequod.de
-
Johannes Löthberg