[arch-projects] [devtools] [PATCH 1/3] sogrep: don't be templated when it is not templated
Partition the Makefile targets to only clean configured files, and make the configured files be a subset of the bin programs. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- .gitignore | 1 - Makefile | 9 ++++++--- sogrep.in => sogrep | 0 3 files changed, 6 insertions(+), 4 deletions(-) rename sogrep.in => sogrep (100%) diff --git a/.gitignore b/.gitignore index 6a1d1e4..b63587b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,4 @@ zsh_completion find-libdeps crossrepomove arch-nspawn -sogrep doc/*.1 diff --git a/Makefile b/Makefile index 055ed2d..39785c3 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ V=20180531 PREFIX = /usr/local MANDIR = $(PREFIX)/share/man -BINPROGS = \ +IN_PROGS = \ checkpkg \ commitpkg \ archco \ @@ -16,7 +16,10 @@ BINPROGS = \ crossrepomove\ arch-nspawn \ mkarchroot \ - makechrootpkg \ + makechrootpkg + +BINPROGS = \ + $(IN_PROGS) \ sogrep CONFIGFILES = \ @@ -90,7 +93,7 @@ doc/%: doc/%.asciidoc a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage -D doc $< clean: - rm -f $(BINPROGS) bash_completion zsh_completion $(MANS) + rm -f $(IN_PROGS) bash_completion zsh_completion $(MANS) install: install -dm0755 $(DESTDIR)$(PREFIX)/bin diff --git a/sogrep.in b/sogrep similarity index 100% rename from sogrep.in rename to sogrep -- 2.21.0
This is the new and improved, canonical sogrep command, now with a valid license. The previous version of sogrep had several issues and inefficiencies, and ultimately wasn't really the finished project I wanted it to be. Due to a mistake in communication, I was totally unaware it was in the process of being merged at all, nor that there was a licensing issue, or I would have recommended waiting for both further improvements, and a declaration of license intent; nevertheless, here it is now, and I formally give this over into the GPLv2+ domain. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- sogrep | 101 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 76 insertions(+), 25 deletions(-) mode change 100644 => 100755 sogrep diff --git a/sogrep b/sogrep old mode 100644 new mode 100755 index 3be2672..56a0e70 --- a/sogrep +++ b/sogrep @@ -1,6 +1,24 @@ #!/bin/bash -# License: Unspecified +# +# sogrep - find shared library links in an Arch Linux repository. +# +# Copyright (c) 2019 by Eli Schwartz <eschwartz@archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. +# +# globals : ${SOLINKS_MIRROR:="https://mirror.pkgbuild.com"} : ${SOCACHE_DIR:="${XDG_CACHE_HOME:-${HOME}/.cache}/sogrep"} repos=('staging' 'testing' 'core' 'extra' @@ -9,54 +27,66 @@ repos=('staging' 'testing' 'core' 'extra' 'gnome-unstable' 'kde-unstable') arches=('x86_64') +# options +REFRESH=0 +VERBOSE=0 + +source /usr/share/makepkg/util/parseopts.sh source /usr/share/makepkg/util/util.sh recache() { - local repo arch + local repo arch verbosity=-s + + (( VERBOSE )) && verbosity=--progress-bar for repo in "${repos[@]}"; do for arch in "${arches[@]}"; do rm -rf "${SOCACHE_DIR}/${arch}/${repo}" mkdir -p "${SOCACHE_DIR}/${arch}/${repo}" - curl "${SOLINKS_MIRROR}/${repo}/os/${arch}/${repo}.links.tar.gz" | bsdtar -xf - -C "${SOCACHE_DIR}/${arch}/${repo}" + curl "$verbosity" "${SOLINKS_MIRROR}/${repo}/os/${arch}/${repo}.links.tar.gz" | bsdtar -xf - -C "${SOCACHE_DIR}/${arch}/${repo}" done done } search() { - local repo=$1 arch lib=$2 + local repo=$1 arch lib=$2 srepos=("${repos[@]}") if [[ $repo != all ]]; then - if ! in_array "$repo" "${repos[@]}"; then + if ! in_array "${repo}" "${repos[@]}"; then echo "${BASH_SOURCE[0]##*/}: unrecognized repo '$repo'" echo "Try '${BASH_SOURCE[0]##*/} --help' for more information." exit 1 fi - local repos=("${repo}") - fi - - if [[ ! -d ${SOCACHE_DIR} ]]; then - recache + srepos=("${repo}") fi for arch in "${arches[@]}"; do - for repo in "${repos[@]}"; do + for repo in "${srepos[@]}"; do + local prefix= + (( VERBOSE && ${#srepos[@]} > 1 )) && prefix=${repo}/ db=${SOCACHE_DIR}/${arch}/${repo}/ if [[ -d ${db} ]]; then while read -rd '' pkg; do + read -r match pkg=${pkg#${db}} - printf '%s/%s\n' "${repo}" "${pkg%-*-*/links}" - done < <(grep -rlZ "${lib}" "${db}") + pkg="${prefix}${pkg%-*-*/links}" + + if (( VERBOSE )); then + printf '%-35s %s\n' "${pkg}" "${match}" + else + printf '%s\n' "${pkg}" + fi + done < <(grep -rZ "${lib}" "${db}") | sort -u fi done - done | sort -u + done | resort } usage() { cat <<- _EOF_ Usage: ${BASH_SOURCE[0]##*/} [OPTIONS] REPO LIBNAME - Check the soname links database for pacman repositories containing + Check the soname links database for Arch Linux repositories containing packages linked to a given shared library. If the repository specified is "all", then all repositories will be searched, otherwise only the named repository will be searched. @@ -64,35 +94,56 @@ usage() { If the links database does not exist, it will be downloaded first. OPTIONS + -v, --verbose Show matched links in addition to pkgname -r, --refresh Refresh the links databases -h, --help Show this help text _EOF_ } +# utility function to resort with multiple repos + no-verbose +resort() { sort -u; } + if (( $# == 0 )); then echo "error: No arguments passed." echo "Try '${BASH_SOURCE[0]##*/} --help' for more information." exit 1 fi +OPT_SHORT='vrh' +OPT_LONG=('verbose' 'refresh' 'help') +if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then + exit 1 +fi +set -- "${OPTRET[@]}" -while (( $# )); do +while :; do case $1 in + -v|--verbose) + resort() { cat; } + VERBOSE=1 + ;; -r|--refresh) - recache + REFRESH=1 ;; -h|--help) usage exit 0 ;; - *) - if (( $# < 2 )); then - echo "error: Not enough arguments passed." - echo "Try '${BASH_SOURCE[0]##*/} --help' for more information." - exit 1 - fi - search "$@" - exit $? + --) + shift; break ;; esac shift done + +if ! (( ( REFRESH && $# == 0 ) || $# == 2 )); then + echo "error: Incorrect number of arguments passed." + echo "Try '${BASH_SOURCE[0]##*/} --help' for more information." + exit 1 +fi + +if (( REFRESH )) || [[ ! -d ${SOCACHE_DIR} ]]; then + recache + (( $# == 2 )) || exit 0 +fi + +search "$@" -- 2.21.0
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- doc/sogrep.1.asciidoc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/sogrep.1.asciidoc b/doc/sogrep.1.asciidoc index bc8f6ce..037773a 100644 --- a/doc/sogrep.1.asciidoc +++ b/doc/sogrep.1.asciidoc @@ -3,7 +3,7 @@ sogrep(1) Name ---- -sogrep - Find packages using a linked to a given shared library +sogrep - Find shared library links in an Arch Linux repository Synopsis -------- @@ -12,7 +12,7 @@ sogrep [options] repo libname Description ----------- -Check the soname links database for pacman repositories containing packages +Check the soname links database for Arch Linux repositories containing packages linked to a given shared library. If the repository specified is "all", then all repositories will be searched, otherwise only the named repository will be searched. @@ -22,6 +22,12 @@ If the links database does not exist, it will be downloaded first. Options ------- +*-v, --verbose*:: + Provide detailed output containing the matched links for each package, the + repository it came from (in the event that all repositories are being + searched), and, in combination with `-r`, a progress bar for the links + database download. + *-r, --refresh*:: Refresh the links databases -- 2.21.0
participants (1)
-
Eli Schwartz