October 2016 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Move bash/zsh completion out of contrib
by Allan McRae 10 Oct '16

10 Oct '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- The "remove contrib" patch has been rebased on top of this. contrib/Makefile.am | 22 ++-------------- scripts/Makefile.am | 29 +++++++++++++++++++++- scripts/completion/.gitignore | 2 ++ {contrib => scripts/completion}/bash_completion.in | 0 {contrib => scripts/completion}/zsh_completion.in | 0 5 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 scripts/completion/.gitignore rename {contrib => scripts/completion}/bash_completion.in (100%) rename {contrib => scripts/completion}/zsh_completion.in (100%) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 897cd85..73df92e 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -28,14 +28,9 @@ OURSCRIPTS = \ $(BASHSCRIPTS) \ $(OTHERSCRIPTS) -OURFILES = \ - bash_completion \ - zsh_completion - EXTRA_DIST = \ PKGBUILD.vim \ bacman.sh.in \ - bash_completion.in \ checkupdates.sh.in \ paccache.sh.in \ paclog-pkglist.sh.in \ @@ -46,11 +41,10 @@ EXTRA_DIST = \ rankmirrors.sh.in \ updpkgsums.sh.in \ vimprojects \ - zsh_completion.in \ README # Files that should be removed, but which Automake does not know. -MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp +MOSTLYCLEANFILES = $(OURSCRIPTS) *.tmp if USE_GIT_VERSION GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') @@ -85,20 +79,9 @@ $(OURFILES): Makefile $(AM_V_at)chmod a-w $@.tmp $(AM_V_at)mv $@.tmp $@ -all-am: $(OURSCRIPTS) $(OURFILES) - -install-data-local: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/ - $(INSTALL_DATA) bash_completion $(DESTDIR)$(sysconfdir)/bash_completion.d/pacman - $(MKDIR_P) $(DESTDIR)$(datarootdir)/zsh/site-functions/ - $(INSTALL_DATA) zsh_completion $(DESTDIR)$(datarootdir)/zsh/site-functions/_pacman - -uninstall-local: - $(RM) $(DESTDIR)$(sysconfdir)/bash_completion.d/pacman - $(RM) $(DESTDIR)$(datarootdir)/zsh/site-functions/_pacman +all-am: $(OURSCRIPTS) bacman: $(srcdir)/bacman.sh.in -bash_completion: $(srcdir)/bash_completion.in checkupdates: $(srcdir)/checkupdates.sh.in paccache: $(srcdir)/paccache.sh.in $(top_srcdir)/scripts/library/parseopts.sh $(top_srcdir)/scripts/library/size_to_human.sh pacdiff: $(srcdir)/pacdiff.sh.in @@ -108,6 +91,5 @@ pacscripts: $(srcdir)/pacscripts.sh.in pacsearch: $(srcdir)/pacsearch.in rankmirrors: $(srcdir)/rankmirrors.sh.in updpkgsums: $(srcdir)/updpkgsums.sh.in -zsh_completion: $(srcdir)/zsh_completion.in # vim:set noet: diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 8662496..8278b6f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -26,6 +26,7 @@ EXTRA_DIST = \ pacman-key.sh.in \ pkgdelta.sh.in \ repo-add.sh.in \ + $(COMPLETION_DIST) \ $(LIBRARY) \ $(LIBMAKEPKG_DIST) @@ -102,8 +103,15 @@ LIBMAKEPKG_DIST = \ $(LIBMAKEPKG) \ $(addsuffix .in, $(LIBMAKEPKG_IN)) +COMPLETION_IN = \ + completion/bash_completion \ + completion/zsh_completion + +COMPLETION_DIST = \ + $(addsuffix .in, $(COMPLETION_IN)) + # Files that should be removed, but which Automake does not know. -MOSTLYCLEANFILES = $(bin_SCRIPTS) $(LIBMAKEPKG_IN) +MOSTLYCLEANFILES = $(bin_SCRIPTS) $(LIBMAKEPKG_IN) $(COMPLETION_IN) clean-local: $(AM_V_at)$(RM) -r .lib @@ -157,6 +165,14 @@ $(LIBMAKEPKG_IN): %: %.in Makefile $(AM_V_at)chmod a-w $@ @$(BASH_SHELL) -O extglob -n $@ +$(COMPLETION_IN): %: %.in Makefile + $(AM_V_at)$(RM) $@ + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(edit) $(srcdir)/$@.in >$@ + $(AM_V_at)chmod a-w $@ + +all-am: $(COMPLETION_IN) + makepkg: \ $(srcdir)/makepkg.sh.in \ $(srcdir)/makepkg-wrapper.sh.in \ @@ -213,6 +229,16 @@ makepkg-wrapper: \ $(AM_V_at)chmod +x,a-w $@ $(AM_V_at)$(LN_S) makepkg-wrapper makepkg +install-data-local: + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/ + $(INSTALL_DATA) completion/bash_completion $(DESTDIR)$(sysconfdir)/bash_completion.d/pacman + $(MKDIR_P) $(DESTDIR)$(datarootdir)/zsh/site-functions/ + $(INSTALL_DATA) completion/zsh_completion $(DESTDIR)$(datarootdir)/zsh/site-functions/_pacman + +uninstall-local: + $(RM) $(DESTDIR)$(sysconfdir)/bash_completion.d/pacman + $(RM) $(DESTDIR)$(datarootdir)/zsh/site-functions/_pacman + install-exec-hook: cd $(DESTDIR)$(bindir) && \ $(RM) makepkg makepkg-wrapper @@ -247,4 +273,5 @@ uninstall-hook: $(RM) -r $(DESTDIR)$(libmakepkgdir)/$$dir; \ done + # vim:set noet: diff --git a/scripts/completion/.gitignore b/scripts/completion/.gitignore new file mode 100644 index 0000000..881bfd1 --- /dev/null +++ b/scripts/completion/.gitignore @@ -0,0 +1,2 @@ +bash_completion +zsh_completion diff --git a/contrib/bash_completion.in b/scripts/completion/bash_completion.in similarity index 100% rename from contrib/bash_completion.in rename to scripts/completion/bash_completion.in diff --git a/contrib/zsh_completion.in b/scripts/completion/zsh_completion.in similarity index 100% rename from contrib/zsh_completion.in rename to scripts/completion/zsh_completion.in -- 2.10.0

1 0

[pacman-dev] [PATCH v3 0/2] Move parseopts from library to makepkg
by Alad Wenter 08 Oct '16

08 Oct '16

v3: - account for tests (PM_LIBMAKEPKG_DIR) - fix other scripts (apart from contrib) - add commit messages - generate util/*.sh with make Note: parseopts uses $0 to get the script name inside the error message; BASH_SOURCE would display the name of the libmakepkg script. An other option is to set a fixed "argv0" variable in the various scripts, and refer to that from parseopts. Alad Wenter (2): makepkg: Move parseopts from library to libmakepkg libmakepkg: generate scripts in util Makefile.am | 3 +- scripts/Makefile.am | 14 +- .../libmakepkg/util/{message.sh => message.sh.in} | 0 scripts/libmakepkg/util/option.sh | 142 ---------- scripts/libmakepkg/util/option.sh.in | 299 +++++++++++++++++++++ scripts/libmakepkg/util/{util.sh => util.sh.in} | 0 scripts/library/README | 20 -- scripts/library/parseopts.sh | 137 ---------- scripts/makepkg.sh.in | 2 - scripts/pacman-db-upgrade.sh.in | 7 +- scripts/pacman-key.sh.in | 7 +- scripts/pkgdelta.sh.in | 9 +- scripts/po/POTFILES.in | 2 +- scripts/po/ar.po | 10 +- scripts/po/ast.po | 10 +- scripts/po/az_AZ.po | 10 +- scripts/po/bg.po | 10 +- scripts/po/br.po | 10 +- scripts/po/ca.po | 10 +- scripts/po/cs.po | 10 +- scripts/po/da.po | 10 +- scripts/po/de.po | 10 +- scripts/po/el.po | 10 +- scripts/po/en_GB.po | 10 +- scripts/po/eo.po | 10 +- scripts/po/es.po | 10 +- scripts/po/es_419.po | 10 +- scripts/po/eu.po | 10 +- scripts/po/fi.po | 10 +- scripts/po/fr.po | 10 +- scripts/po/gl.po | 10 +- scripts/po/hr.po | 10 +- scripts/po/hu.po | 10 +- scripts/po/id.po | 10 +- scripts/po/is.po | 10 +- scripts/po/it.po | 10 +- scripts/po/ja.po | 10 +- scripts/po/ka.po | 10 +- scripts/po/kk.po | 10 +- scripts/po/ko.po | 10 +- scripts/po/lt.po | 10 +- scripts/po/nb.po | 10 +- scripts/po/nl.po | 10 +- scripts/po/pacman-scripts.pot | 10 +- scripts/po/pl.po | 10 +- scripts/po/pt.po | 10 +- scripts/po/pt_BR.po | 10 +- scripts/po/ro.po | 10 +- scripts/po/ru.po | 10 +- scripts/po/sk.po | 10 +- scripts/po/sl.po | 10 +- scripts/po/sr.po | 10 +- scripts/po/sr(a)latin.po | 10 +- scripts/po/sv.po | 10 +- scripts/po/tr.po | 10 +- scripts/po/uk.po | 10 +- scripts/po/uz.po | 10 +- scripts/po/zh_CN.po | 10 +- scripts/po/zh_TW.po | 10 +- test/scripts/parseopts_test.sh | 2 +- 60 files changed, 559 insertions(+), 545 deletions(-) rename scripts/libmakepkg/util/{message.sh => message.sh.in} (100%) delete mode 100644 scripts/libmakepkg/util/option.sh create mode 100644 scripts/libmakepkg/util/option.sh.in rename scripts/libmakepkg/util/{util.sh => util.sh.in} (100%) delete mode 100644 scripts/library/parseopts.sh -- 2.10.0

1 0

[pacman-dev] [PATCH v2] makepkg: Move parseopts from library to libmakepkg
by Alad Wenter 08 Oct '16

08 Oct '16

Signed-off-by: Alad Wenter <alad(a)archlinux.info> --- v2: Add missing signoff. scripts/libmakepkg/util/option.sh | 157 ++++++++++++++++++++++++++++++++++++++ scripts/library/README | 20 ----- scripts/library/parseopts.sh | 137 --------------------------------- scripts/makepkg.sh.in | 2 - 4 files changed, 157 insertions(+), 159 deletions(-) delete mode 100644 scripts/library/parseopts.sh diff --git a/scripts/libmakepkg/util/option.sh b/scripts/libmakepkg/util/option.sh index 54ba474..4d5fd78 100644 --- a/scripts/libmakepkg/util/option.sh +++ b/scripts/libmakepkg/util/option.sh @@ -140,3 +140,160 @@ check_buildoption() { # not found return 127 } + + +# parseopts.sh: +# A getopt_long-like parser which portably supports longopts and +# shortopts with some GNU extensions. It does not allow for options +# with optional arguments. For both short and long opts, options +# requiring an argument should be suffixed with a colon. After the +# first argument containing the short opts, any number of valid long +# opts may be be passed. The end of the options delimiter must then be +# added, followed by the user arguments to the calling program. +# +# Recommended Usage: +# OPT_SHORT='fb:z' +# OPT_LONG=('foo' 'bar:' 'baz') +# if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then +# exit 1 +# fi +# set -- "${OPTRET[@]}" +# Returns: +# 0: parse success +# 1: parse failure (error message supplied) +parseopts() { + local opt= optarg= i= shortopts=$1 + local -a longopts=() unused_argv=() + + shift + while [[ $1 && $1 != '--' ]]; do + longopts+=("$1") + shift + done + shift + + longoptmatch() { + local o longmatch=() + for o in "${longopts[@]}"; do + if [[ ${o%:} = "$1" ]]; then + longmatch=("$o") + break + fi + [[ ${o%:} = "$1"* ]] && longmatch+=("$o") + done + + case ${#longmatch[*]} in + 1) + # success, override with opt and return arg req (0 == none, 1 == required) + opt=${longmatch%:} + if [[ $longmatch = *: ]]; then + return 1 + else + return 0 + fi ;; + 0) + # fail, no match found + return 255 ;; + *) + # fail, ambiguous match + printf "@SCRIPTNAME@: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" + printf " '%s'" "${longmatch[@]%:}" + printf '\n' + return 254 ;; + esac >&2 + } + + while (( $# )); do + case $1 in + --) # explicit end of options + shift + break + ;; + -[!-]*) # short option + for (( i = 1; i < ${#1}; i++ )); do + opt=${1:i:1} + + # option doesn't exist + if [[ $shortopts != *$opt* ]]; then + printf "@SCRIPTNAME@: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + + OPTRET+=("-$opt") + # option requires optarg + if [[ $shortopts = *$opt:* ]]; then + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("${1:i+1}") + break + # if we're at the end, grab the the next positional, if it exists + elif (( i == ${#1} - 1 )) && [[ $2 ]]; then + OPTRET+=("$2") + shift + break + # parse failure + else + printf "@SCRIPTNAME@: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + fi + done + ;; + --?*=*|--?*) # long option + IFS='=' read -r opt optarg <<< "${1#--}" + longoptmatch "$opt" + case $? in + 0) + # parse failure + if [[ $optarg ]]; then + printf "@SCRIPTNAME@: $(gettext "option '%s' does not allow an argument")\n" "--$opt" >&2 + OPTRET=(--) + return 1 + # --longopt + else + OPTRET+=("--$opt") + fi + ;; + 1) + # --longopt=optarg + if [[ $optarg ]]; then + OPTRET+=("--$opt" "$optarg") + # --longopt optarg + elif [[ $2 ]]; then + OPTRET+=("--$opt" "$2" ) + shift + # parse failure + else + printf "@SCRIPTNAME@: $(gettext "option '%s' requires an argument")\n" "--$opt" >&2 + OPTRET=(--) + return 1 + fi + ;; + 254) + # ambiguous option -- error was reported for us by longoptmatch() + OPTRET=(--) + return 1 + ;; + 255) + # parse failure + printf "@SCRIPTNAME@: $(gettext "invalid option") '--%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + ;; + esac + ;; + *) # non-option arg encountered, add it as a parameter + unused_argv+=("$1") + ;; + esac + shift + done + + # add end-of-opt terminator and any leftover positional parameters + OPTRET+=('--' "${unused_argv[@]}" "$@") + unset longoptmatch + + return 0 +} diff --git a/scripts/library/README b/scripts/library/README index e9615a2..a9d15f1 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -8,26 +8,6 @@ stdout and can be silenced by defining 'QUIET'. The 'warning' and 'error' functions print to stderr with the appropriate prefix added to the message. -parseopts.sh: -A getopt_long-like parser which portably supports longopts and shortopts -with some GNU extensions. It does not allow for options with optional -arguments. For both short and long opts, options requiring an argument -should be suffixed with a colon. After the first argument containing -the short opts, any number of valid long opts may be be passed. The end -of the options delimiter must then be added, followed by the user arguments -to the calling program. - -Recommended Usage: - OPT_SHORT='fb:z' - OPT_LONG=('foo' 'bar:' 'baz') - if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then - exit 1 - fi - set -- "${OPTRET[@]}" -Returns: - 0: parse success - 1: parse failure (error message supplied) - human_to_size.sh: A function to convert human readable sizes (such as "5.3 GiB") to raw byte equivalents. base10 and base2 suffixes are supported, case sensitively. If diff --git a/scripts/library/parseopts.sh b/scripts/library/parseopts.sh deleted file mode 100644 index cf6aa6c..0000000 --- a/scripts/library/parseopts.sh +++ /dev/null @@ -1,137 +0,0 @@ -# getopt-like parser -parseopts() { - local opt= optarg= i= shortopts=$1 - local -a longopts=() unused_argv=() - - shift - while [[ $1 && $1 != '--' ]]; do - longopts+=("$1") - shift - done - shift - - longoptmatch() { - local o longmatch=() - for o in "${longopts[@]}"; do - if [[ ${o%:} = "$1" ]]; then - longmatch=("$o") - break - fi - [[ ${o%:} = "$1"* ]] && longmatch+=("$o") - done - - case ${#longmatch[*]} in - 1) - # success, override with opt and return arg req (0 == none, 1 == required) - opt=${longmatch%:} - if [[ $longmatch = *: ]]; then - return 1 - else - return 0 - fi ;; - 0) - # fail, no match found - return 255 ;; - *) - # fail, ambiguous match - printf "@SCRIPTNAME@: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" - printf " '%s'" "${longmatch[@]%:}" - printf '\n' - return 254 ;; - esac >&2 - } - - while (( $# )); do - case $1 in - --) # explicit end of options - shift - break - ;; - -[!-]*) # short option - for (( i = 1; i < ${#1}; i++ )); do - opt=${1:i:1} - - # option doesn't exist - if [[ $shortopts != *$opt* ]]; then - printf "@SCRIPTNAME@: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - - OPTRET+=("-$opt") - # option requires optarg - if [[ $shortopts = *$opt:* ]]; then - # if we're not at the end of the option chunk, the rest is the optarg - if (( i < ${#1} - 1 )); then - OPTRET+=("${1:i+1}") - break - # if we're at the end, grab the the next positional, if it exists - elif (( i == ${#1} - 1 )) && [[ $2 ]]; then - OPTRET+=("$2") - shift - break - # parse failure - else - printf "@SCRIPTNAME@: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - fi - done - ;; - --?*=*|--?*) # long option - IFS='=' read -r opt optarg <<< "${1#--}" - longoptmatch "$opt" - case $? in - 0) - # parse failure - if [[ $optarg ]]; then - printf "@SCRIPTNAME@: $(gettext "option '%s' does not allow an argument")\n" "--$opt" >&2 - OPTRET=(--) - return 1 - # --longopt - else - OPTRET+=("--$opt") - fi - ;; - 1) - # --longopt=optarg - if [[ $optarg ]]; then - OPTRET+=("--$opt" "$optarg") - # --longopt optarg - elif [[ $2 ]]; then - OPTRET+=("--$opt" "$2" ) - shift - # parse failure - else - printf "@SCRIPTNAME@: $(gettext "option '%s' requires an argument")\n" "--$opt" >&2 - OPTRET=(--) - return 1 - fi - ;; - 254) - # ambiguous option -- error was reported for us by longoptmatch() - OPTRET=(--) - return 1 - ;; - 255) - # parse failure - printf "@SCRIPTNAME@: $(gettext "invalid option") '--%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - ;; - esac - ;; - *) # non-option arg encountered, add it as a parameter - unused_argv+=("$1") - ;; - esac - shift - done - - # add end-of-opt terminator and any leftover positional parameters - OPTRET+=('--' "${unused_argv[@]}" "$@") - unset longoptmatch - - return 0 -} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce51..b3cafa8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1153,8 +1153,6 @@ run_split_packaging() { pkgname=("${pkgname_backup[@]}") } -m4_include(library/parseopts.sh) - usage() { printf "makepkg (pacman) %s\n" "$makepkg_version" echo -- 2.10.0

2 2

[pacman-dev] shellcheck conformity for makepkg
by Alad Wenter 08 Oct '16

08 Oct '16

shellcheck is a static analysis tool to check common mistakes in shell scripting. Running it on makepkg yields 116 warnings; below I propose how to address some of them. The idea would be that each warning, if applicable, is addressed in a separate patch. * /usr/bin/makepkg:138:10: warning: Declare and assign separately to avoid masking return values. [SC2155] makepkg does separate declare and assign statements _if_ it wants to exit on the failure of the assignment. Keeping this separation consistent is both more clear and avoids later possible mistakes should further "|| exit" clauses be desired. https://github.com/koalaman/shellcheck/wiki/SC2155 * /usr/bin/makepkg:149:16: error: Double quote array expansions to avoid re-splitting elements. [SC2068] /usr/bin/makepkg:170:14: note: Double quote to prevent globbing and word splitting. [SC2086] General quoting errors: https://github.com/koalaman/shellcheck/wiki/SC2068 https://github.com/koalaman/shellcheck/wiki/SC2086 * /usr/bin/makepkg:291:32: warning: Use "$@" (with quotes) to prevent whitespace problems. [SC2048] The line in question is: deplist="$(set +E; check_deps $*)" || exit 1 I'm not sure why this needs to be a single, unquoted string; the check_deps function itself uses "$@". * /usr/bin/makepkg:314:8: note: Use grep -q instead of comparing output with [ -n .. ]. [SC2143] The line in question is: if [[ -n $(grep -xvFf <(printf '%s\n' "${current_pkglist[@]}") \ <(printf '%s\n' "${original_pkglist[@]}")) ]]; then Instead of an extra -n test, grep -q would do. https://github.com/koalaman/shellcheck/wiki/SC2143 * /usr/bin/makepkg:323:11: warning: Expanding an array without an index only gives the first element. [SC2128] For example: mapfile -t filename < <(find "$pkgdir" -type f -name $p\*) if [[ $filename ]]; then It should always clear from the code that arrays are used; if you simply want to check if it is empty, ${filename[*]} can be used. https://github.com/koalaman/shellcheck/wiki/SC2128 * /usr/bin/makepkg:404:1: warning: generate_checksums references arguments, but none are ever passed. [SC2120] /usr/bin/makepkg:2181:2: note: Use generate_checksums "$@" if function's $1 should mean script's $1. [SC2119] This function accounts for arguments, but seems only used without them in the GENINTEG if list. * /usr/bin/makepkg:659:11: note: $/${} is unnecessary on arithmetic variables. [SC2004] https://github.com/koalaman/shellcheck/wiki/SC2004 * /usr/bin/makepkg:666:13: warning: Don't use variables in the printf format string. Use printf "..%s.." "$foo". [SC2059] https://github.com/koalaman/shellcheck/wiki/SC2059 * /usr/bin/makepkg:1138:23: warning: url is referenced but not assigned. [SC2154] There's a few of these; not sure this is an issue since these are optional variables in a PKGBUILD and we don't have set -u. * /usr/bin/makepkg:1224:22: note: Use ./*glob* or -- *glob* so names with dashes won't become options. [SC2035] Though it seems unlikely to compress a file starting in a slash, ./ adds some safety; it doesn't impact the used nullglob: # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob LANG=C bsdtar -czf .MTREE --format=mtree \ --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \ "${comp_files[@]}" * https://github.com/koalaman/shellcheck/wiki/SC2035 * /usr/bin/makepkg:1298:8: warning: Variable was used as an array but is now assigned a string. [SC2178] This seems to be a false positive since filename is an array elsewhere in the script, but here it is a local. * /usr/bin/makepkg:1666:27: error: Braces are required when expanding arrays, as in ${array[idx]}. [SC1087] Shellcheck probably isn't aware of the eval construct. * /usr/bin/makepkg:1700:11: warning: Remove space after = if trying to assign a value (for empty string, use var='' ... ). [SC1007] The "local foo=" style is only used here, and "local foo" would have the same effect. * /usr/bin/makepkg:1996:18: warning: Use single quotes, otherwise this expands now rather than when signalled. [SC2064] There's a few nested quotes here, I guess it works as intended ... * /usr/bin/makepkg:2068:10: warning: Exporting an expansion rather than a variable. [SC2163] Probably as intended * /usr/bin/makepkg:2350:11: warning: Use "${var:?}" to ensure this never expands to /* . [SC2115] Well, makepkg can't run as root since 4.2, but good to add this anyway. https://github.com/koalaman/shellcheck/wiki/SC2115 Alad

2 1

[pacman-dev] [PATCH] makepkg: Move parseopts from library to libmakepkg
by Alad Wenter 08 Oct '16

08 Oct '16

--- scripts/libmakepkg/util/option.sh | 157 ++++++++++++++++++++++++++++++++++++++ scripts/library/README | 20 ----- scripts/library/parseopts.sh | 137 --------------------------------- scripts/makepkg.sh.in | 2 - 4 files changed, 157 insertions(+), 159 deletions(-) delete mode 100644 scripts/library/parseopts.sh diff --git a/scripts/libmakepkg/util/option.sh b/scripts/libmakepkg/util/option.sh index 54ba474..4d5fd78 100644 --- a/scripts/libmakepkg/util/option.sh +++ b/scripts/libmakepkg/util/option.sh @@ -140,3 +140,160 @@ check_buildoption() { # not found return 127 } + + +# parseopts.sh: +# A getopt_long-like parser which portably supports longopts and +# shortopts with some GNU extensions. It does not allow for options +# with optional arguments. For both short and long opts, options +# requiring an argument should be suffixed with a colon. After the +# first argument containing the short opts, any number of valid long +# opts may be be passed. The end of the options delimiter must then be +# added, followed by the user arguments to the calling program. +# +# Recommended Usage: +# OPT_SHORT='fb:z' +# OPT_LONG=('foo' 'bar:' 'baz') +# if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then +# exit 1 +# fi +# set -- "${OPTRET[@]}" +# Returns: +# 0: parse success +# 1: parse failure (error message supplied) +parseopts() { + local opt= optarg= i= shortopts=$1 + local -a longopts=() unused_argv=() + + shift + while [[ $1 && $1 != '--' ]]; do + longopts+=("$1") + shift + done + shift + + longoptmatch() { + local o longmatch=() + for o in "${longopts[@]}"; do + if [[ ${o%:} = "$1" ]]; then + longmatch=("$o") + break + fi + [[ ${o%:} = "$1"* ]] && longmatch+=("$o") + done + + case ${#longmatch[*]} in + 1) + # success, override with opt and return arg req (0 == none, 1 == required) + opt=${longmatch%:} + if [[ $longmatch = *: ]]; then + return 1 + else + return 0 + fi ;; + 0) + # fail, no match found + return 255 ;; + *) + # fail, ambiguous match + printf "@SCRIPTNAME@: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" + printf " '%s'" "${longmatch[@]%:}" + printf '\n' + return 254 ;; + esac >&2 + } + + while (( $# )); do + case $1 in + --) # explicit end of options + shift + break + ;; + -[!-]*) # short option + for (( i = 1; i < ${#1}; i++ )); do + opt=${1:i:1} + + # option doesn't exist + if [[ $shortopts != *$opt* ]]; then + printf "@SCRIPTNAME@: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + + OPTRET+=("-$opt") + # option requires optarg + if [[ $shortopts = *$opt:* ]]; then + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("${1:i+1}") + break + # if we're at the end, grab the the next positional, if it exists + elif (( i == ${#1} - 1 )) && [[ $2 ]]; then + OPTRET+=("$2") + shift + break + # parse failure + else + printf "@SCRIPTNAME@: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + fi + done + ;; + --?*=*|--?*) # long option + IFS='=' read -r opt optarg <<< "${1#--}" + longoptmatch "$opt" + case $? in + 0) + # parse failure + if [[ $optarg ]]; then + printf "@SCRIPTNAME@: $(gettext "option '%s' does not allow an argument")\n" "--$opt" >&2 + OPTRET=(--) + return 1 + # --longopt + else + OPTRET+=("--$opt") + fi + ;; + 1) + # --longopt=optarg + if [[ $optarg ]]; then + OPTRET+=("--$opt" "$optarg") + # --longopt optarg + elif [[ $2 ]]; then + OPTRET+=("--$opt" "$2" ) + shift + # parse failure + else + printf "@SCRIPTNAME@: $(gettext "option '%s' requires an argument")\n" "--$opt" >&2 + OPTRET=(--) + return 1 + fi + ;; + 254) + # ambiguous option -- error was reported for us by longoptmatch() + OPTRET=(--) + return 1 + ;; + 255) + # parse failure + printf "@SCRIPTNAME@: $(gettext "invalid option") '--%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + ;; + esac + ;; + *) # non-option arg encountered, add it as a parameter + unused_argv+=("$1") + ;; + esac + shift + done + + # add end-of-opt terminator and any leftover positional parameters + OPTRET+=('--' "${unused_argv[@]}" "$@") + unset longoptmatch + + return 0 +} diff --git a/scripts/library/README b/scripts/library/README index e9615a2..a9d15f1 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -8,26 +8,6 @@ stdout and can be silenced by defining 'QUIET'. The 'warning' and 'error' functions print to stderr with the appropriate prefix added to the message. -parseopts.sh: -A getopt_long-like parser which portably supports longopts and shortopts -with some GNU extensions. It does not allow for options with optional -arguments. For both short and long opts, options requiring an argument -should be suffixed with a colon. After the first argument containing -the short opts, any number of valid long opts may be be passed. The end -of the options delimiter must then be added, followed by the user arguments -to the calling program. - -Recommended Usage: - OPT_SHORT='fb:z' - OPT_LONG=('foo' 'bar:' 'baz') - if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then - exit 1 - fi - set -- "${OPTRET[@]}" -Returns: - 0: parse success - 1: parse failure (error message supplied) - human_to_size.sh: A function to convert human readable sizes (such as "5.3 GiB") to raw byte equivalents. base10 and base2 suffixes are supported, case sensitively. If diff --git a/scripts/library/parseopts.sh b/scripts/library/parseopts.sh deleted file mode 100644 index cf6aa6c..0000000 --- a/scripts/library/parseopts.sh +++ /dev/null @@ -1,137 +0,0 @@ -# getopt-like parser -parseopts() { - local opt= optarg= i= shortopts=$1 - local -a longopts=() unused_argv=() - - shift - while [[ $1 && $1 != '--' ]]; do - longopts+=("$1") - shift - done - shift - - longoptmatch() { - local o longmatch=() - for o in "${longopts[@]}"; do - if [[ ${o%:} = "$1" ]]; then - longmatch=("$o") - break - fi - [[ ${o%:} = "$1"* ]] && longmatch+=("$o") - done - - case ${#longmatch[*]} in - 1) - # success, override with opt and return arg req (0 == none, 1 == required) - opt=${longmatch%:} - if [[ $longmatch = *: ]]; then - return 1 - else - return 0 - fi ;; - 0) - # fail, no match found - return 255 ;; - *) - # fail, ambiguous match - printf "@SCRIPTNAME@: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" - printf " '%s'" "${longmatch[@]%:}" - printf '\n' - return 254 ;; - esac >&2 - } - - while (( $# )); do - case $1 in - --) # explicit end of options - shift - break - ;; - -[!-]*) # short option - for (( i = 1; i < ${#1}; i++ )); do - opt=${1:i:1} - - # option doesn't exist - if [[ $shortopts != *$opt* ]]; then - printf "@SCRIPTNAME@: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - - OPTRET+=("-$opt") - # option requires optarg - if [[ $shortopts = *$opt:* ]]; then - # if we're not at the end of the option chunk, the rest is the optarg - if (( i < ${#1} - 1 )); then - OPTRET+=("${1:i+1}") - break - # if we're at the end, grab the the next positional, if it exists - elif (( i == ${#1} - 1 )) && [[ $2 ]]; then - OPTRET+=("$2") - shift - break - # parse failure - else - printf "@SCRIPTNAME@: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - fi - done - ;; - --?*=*|--?*) # long option - IFS='=' read -r opt optarg <<< "${1#--}" - longoptmatch "$opt" - case $? in - 0) - # parse failure - if [[ $optarg ]]; then - printf "@SCRIPTNAME@: $(gettext "option '%s' does not allow an argument")\n" "--$opt" >&2 - OPTRET=(--) - return 1 - # --longopt - else - OPTRET+=("--$opt") - fi - ;; - 1) - # --longopt=optarg - if [[ $optarg ]]; then - OPTRET+=("--$opt" "$optarg") - # --longopt optarg - elif [[ $2 ]]; then - OPTRET+=("--$opt" "$2" ) - shift - # parse failure - else - printf "@SCRIPTNAME@: $(gettext "option '%s' requires an argument")\n" "--$opt" >&2 - OPTRET=(--) - return 1 - fi - ;; - 254) - # ambiguous option -- error was reported for us by longoptmatch() - OPTRET=(--) - return 1 - ;; - 255) - # parse failure - printf "@SCRIPTNAME@: $(gettext "invalid option") '--%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - ;; - esac - ;; - *) # non-option arg encountered, add it as a parameter - unused_argv+=("$1") - ;; - esac - shift - done - - # add end-of-opt terminator and any leftover positional parameters - OPTRET+=('--' "${unused_argv[@]}" "$@") - unset longoptmatch - - return 0 -} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce51..b3cafa8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1153,8 +1153,6 @@ run_split_packaging() { pkgname=("${pkgname_backup[@]}") } -m4_include(library/parseopts.sh) - usage() { printf "makepkg (pacman) %s\n" "$makepkg_version" echo -- 2.10.0

1 0

[pacman-dev] [RFC, PATCHES]: Very preliminary work towards clean build with clang -Weverything
by ivy.foster＠gmail.com 01 Oct '16

01 Oct '16

First of all, don't worry; I'm under no illusion that the pie-in-the-sky Subject line is anything that will happen in the near future, nor even necessarily a goal for the project (given just how finicky -Weverything is). Basically, I'm wondering whether sporadic patches addressing the sorts of things "clang -Weverything" gripes about would be considered welcome contributions, or nitpicking. By "sporadic patches", I mean that any of this sort from me would come when I felt like working on a coding project but didn't have anything particularly in mind. As a sample, I've made two patches addressing some of its earliest warnings. The first changes several headers to (say) #define IDENTIFIERS rather than _IDENTIFIERS. The second adds ALPM_ERR_OK = 0 to the _alpm_err_t enum. Some functions which return an _alpm_err_t return value were returning 0 on success, but there was no 0 value enumerated--not actively harmful, but still an oddity. If this sort of thing isn't of interest, I definitely get it. I just figured that an RFC with patches attached would provide something more concrete to discuss than one without. Cheers, Ivy

5 9

[pacman-dev] [PATCH] Remove pacman-optimize
by Allan McRae 01 Oct '16

01 Oct '16

The people who believe that pacman-optimize is actually doing something useful are the same people who are voting for Trump. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/.gitignore | 1 - scripts/Makefile.am | 6 -- scripts/pacman-optimize.sh.in | 189 ------------------------------------------ 3 files changed, 196 deletions(-) delete mode 100644 scripts/pacman-optimize.sh.in diff --git a/scripts/.gitignore b/scripts/.gitignore index 8dac503..b0cb23f 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -3,7 +3,6 @@ makepkg-template makepkg-wrapper pacman-db-upgrade pacman-key -pacman-optimize pkgdelta repo-add repo-elephant diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e4f9fb1..8662496 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -15,7 +15,6 @@ OURSCRIPTS = \ makepkg \ pacman-db-upgrade \ pacman-key \ - pacman-optimize \ pkgdelta \ repo-add @@ -25,7 +24,6 @@ EXTRA_DIST = \ makepkg-wrapper.sh.in \ pacman-db-upgrade.sh.in \ pacman-key.sh.in \ - pacman-optimize.sh.in \ pkgdelta.sh.in \ repo-add.sh.in \ $(LIBRARY) \ @@ -182,10 +180,6 @@ pacman-key: \ $(srcdir)/library/output_format.sh \ $(srcdir)/library/parseopts.sh -pacman-optimize: \ - $(srcdir)/pacman-optimize.sh.in \ - $(srcdir)/library/output_format.sh - pkgdelta: \ $(srcdir)/pkgdelta.sh.in \ $(srcdir)/library/output_format.sh \ diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in deleted file mode 100644 index f5ad924..0000000 -- 2.10.0

1 0

[pacman-dev] [PATCH 00/11] Streamline syntax of contrib scripts
by Gordian Edenhofer 01 Oct '16

01 Oct '16

Reorganize scripts in contrib to fit the syntax and style of makepkg. Unify multiple different approaches to e.g. write a usage function, handle options and differences in naming schemas for options. Gordian Edenhofer (11): checkupdates: streamline usage function paccache: streamline usage function pacdiff: streamline usage function pacdiff: proper option handling pacdiff: streamline option syntax with makepkg paclist: streamline usage function paclog-pkglist: streamline usage function pacscripts: streamline usage function updpkgsums: streamline usage function rankmirrors: streamline usage function rankmirrors: proper option handling contrib/checkupdates.sh.in | 9 +-- contrib/paccache.sh.in | 61 ++++++++++---------- contrib/pacdiff.sh.in | 76 +++++++++++++++---------- contrib/paclist.sh.in | 10 ++-- contrib/paclog-pkglist.sh.in | 12 ++-- contrib/pacscripts.sh.in | 18 +++--- contrib/rankmirrors.sh.in | 132 +++++++++++++++++++++---------------------- contrib/updpkgsums.sh.in | 21 ++++--- 8 files changed, 179 insertions(+), 160 deletions(-) -- 2.10.0

5 53

[pacman-dev] [PATCH] Give a "success!" message on database check
by Patrick Eigensatz 01 Oct '16

01 Oct '16

'pacman -Dk' prints a "success!" message if there were no errors. It is possible to suppress the output using the '-q / --quiet' flag. This implements the feature discussed at https://bugs.archlinux.org/task/50087 Signed-off-by: Patrick Eigensatz <patrick.eigensatz(a)gmail.com> --- src/pacman/database.c | 4 ++++ src/pacman/pacman.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/pacman/database.c b/src/pacman/database.c index 0197903..5143031 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -286,6 +286,10 @@ int pacman_database(alpm_list_t *targets) } else { ret = check_db_sync(); } + + if(ret == 0 && !config->quiet) { + printf(_("success!\n")); + } } if(config->flags & (ALPM_TRANS_FLAG_ALLDEPS | ALPM_TRANS_FLAG_ALLEXPLICIT)) { diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..b477df7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -466,6 +466,10 @@ static int parsearg_database(int opt) case 'k': (config->op_q_check)++; break; + case OP_QUIET: + case 'q': + config->quiet = 1; + break; default: return 1; } -- 2.10.0

5 7

[pacman-dev] [PATCH] fix --printsrcinfo unify arch and non-arch specific variables
by Levente Polyak 01 Oct '16

01 Oct '16

This fixes the issue with --printsrcinfo that all arch specific variants of a variable get merged into their non arch specific variant. The .SRCINFO file ends up having $depends containing $depends_x86_64 and omitting the latter. --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce51..82c9367 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1476,7 +1476,7 @@ pkgbase=${pkgbase:-${pkgname[0]}} # check the PKGBUILD for some basic requirements lint_pkgbuild || exit 1 -if (( !SOURCEONLY )); then +if (( !SOURCEONLY && !PRINTSRCINFO )); then merge_arch_attrs fi -- 2.10.0

2 1