From 50de87e0e61e4cd5e80e58dcabc0f80b3e94d203 Mon Sep 17 00:00:00 2001 From: Jeffrey Tolar Date: Wed, 21 Jan 2015 19:45:14 -0600 Subject: Remove --asroot from makepkg's completions Signed-off-by: Jeffrey Tolar Signed-off-by: Allan McRae --- contrib/bash_completion.in | 8 ++++---- contrib/zsh_completion.in | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 15e1daca..224b8f92 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -75,10 +75,10 @@ _makepkg() { COMPREPLY=() _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then - opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch - install key log needed noarchive nobuild nocheck nocolor noconfirm nodeps noextract - noprepare noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg - skippgpcheck source syncdeps verifysource version' + opts=('allsource asdeps check clean config force geninteg help holdver ignorearch install + key log needed noarchive nobuild nocheck nocolor noconfirm nodeps noextract noprepare + noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg skippgpcheck + source syncdeps verifysource version' 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts fi diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f2ff7c8a..09058001 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -586,7 +586,6 @@ _makepkg_longopts=( '--syncdeps[Install missing dependencies with pacman]' '--source[Generate a source-only tarball without downloading sources]' '--allsource[Generate a source-only tarball including downloaded source]' - '--asroot[Allow makepkg to run as root user]' '--check[Run check() function in the PKGBUILD]' '--config[Use an alternate config file instead of '@sysconfdir@/makepkg.conf']: :_files' '--holdver[Prevent automatic version bumping for development PKGBUILDs]' -- cgit v1.2.3-70-g09d2 From aa12a773b8d6ed41878081a69d7a1d089129abef Mon Sep 17 00:00:00 2001 From: Jeffrey Tolar Date: Wed, 21 Jan 2015 19:45:15 -0600 Subject: Add --noarchive to makepkg's zsh completion Signed-off-by: Jeffrey Tolar Signed-off-by: Allan McRae --- contrib/zsh_completion.in | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib') diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 09058001..1cae1de0 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -590,6 +590,7 @@ _makepkg_longopts=( '--config[Use an alternate config file instead of '@sysconfdir@/makepkg.conf']: :_files' '--holdver[Prevent automatic version bumping for development PKGBUILDs]' '--key[Specify key to use for gpg signing instead of the default]: :_keys' + '--noarchive[Do not create the archive at the end of the build process]' '--nocheck[Do not run the check() function in the PKGBUILD]' '--noprepare[Do not run the prepare() function in the PKGBUILD]' '--nosign[Do not create a signature for the package]' -- cgit v1.2.3-70-g09d2 From 3b22183a4d39b410ae7be0b95be6a1cb4704a50c Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 24 Jan 2015 15:56:23 +1000 Subject: contrib: remove fakeroot option from PKGBUILD.vim Signed-off-by: Allan McRae --- contrib/PKGBUILD.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 91570637..cf264f93 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -211,7 +211,7 @@ hi def link pbValidSha512sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|purge\|upx\|fakeroot\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags\)/ contained +syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|purge\|upx\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags\)/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption -- cgit v1.2.3-70-g09d2