kiss-community
/
kiss
mirror of https://codeberg.org/kiss-community/kiss
1
0
Fork 1
Code Issues Wiki

kiss: simplify

This commit is contained in:
Dylan Araps 2020-03-23 11:41:32 +02:00
parent 44c6050a39
commit 2db59e03db
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
kiss
View File

@ -101,41 +101,35 @@ pkg_lint() {
# Check that each mandatory file in the package entry exists. # Check that each mandatory file in the package entry exists.
log "$1" "Checking repository files" log "$1" "Checking repository files"
repo_dir=$(pkg_find "$1") cd "$(pkg_find "$1")"
read -r _ release < version
cd "$repo_dir" || die "'$repo_dir' not accessible" [ "$release" ] || die "$1" "Release field not found in version file"
[ -f sources ] || die "$1" "Sources file not found" [ -f sources ] || die "$1" "Sources file not found"
[ -x build ] || die "$1" "Build file not found or not executable" [ -x build ] || die "$1" "Build file not found or not executable"
[ -s version ] || die "$1" "Version file not found or empty" [ -s version ] || die "$1" "Version file not found or empty"
read -r _ release < version [ "$2" ] || [ -f checksums ] ||
[ "$release" ] || die "Release field not found in version file" die "$1" "Checksums are missing"
[ "$2" ] || [ -f checksums ] || die "$pkg" "Checksums are missing"
} }
pkg_find() { pkg_find() {
# Figure out which repository a package belongs to by # Figure out which repository a package belongs to by
# searching for directories matching the package name # searching for directories matching the package name
# in $KISS_PATH/*. # in $KISS_PATH/*.
query=$1 match=$2 query=$1 match=$2 IFS=:; set --
# This ugly mess appends '/.' to the end of each path in # Both counts of word-splitting is intentional here.
# '$KISS_PATH' as POSIX 'find' has no '-mindepth'/'-maxdepth'. # Firstly to split the repositories and secondly to
# See: https://unix.stackexchange.com/a/330372 # allow for the query to be a glob.
IFS=:; set -- # shellcheck disable=2086
for path in $KISS_PATH; do set -- "$@" "$path/."; done for path in $KISS_PATH "$sys_db"; do
IFS=$old_ifs set +f
# Find the repository containing a package. for path2 in "$path/"$query; do
# Searches installed packages if the package is absent [ -d "$path2" ] && set -f -- "$@" "$path2"
# from the repositories. This ugly mess is thanks to POSIX done
# find which has no '-mindepth'/'-maxdepth', etc. done
# See: https://unix.stackexchange.com/a/330372
# See [1] at top of script.
# shellcheck disable=2046,2086
set -- $(find "$@" "$sys_db/." \( ! -name . -prune \) \
! -name .git -a -name "$query" -type d)
# A package may also not be found due to a repository not being # A package may also not be found due to a repository not being
# readable by the current user. Either way, we need to die here. # readable by the current user. Either way, we need to die here.
@ -144,6 +138,8 @@ pkg_find() {
# Show all search results if called from 'kiss search', else # Show all search results if called from 'kiss search', else
# print only the first match. # print only the first match.
[ "$match" ] && printf '%s\n' "$@" || printf '%s\n' "$1" [ "$match" ] && printf '%s\n' "$@" || printf '%s\n' "$1"
IFS=$old_ifs
} }
pkg_list() { pkg_list() {