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

kiss: Minor clean up

This commit is contained in:
Dylan Araps 2020-05-23 09:25:41 +03:00
parent 2c19349a09
commit 14695e2bf8
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kiss
View File

@ -194,6 +194,8 @@ pkg_list() {
} }
pkg_cache() { pkg_cache() {
# Find the tarball of a package using a glob. Use the first found match
# of '<pkg_name>#<pkg_version><pkg_release>.tar.*'.
read -r version release 2>/dev/null < "$(pkg_find "$1")/version" read -r version release 2>/dev/null < "$(pkg_find "$1")/version"
set +f; set -f -- "$bin_dir/$1#$version-$release.tar."* set +f; set -f -- "$bin_dir/$1#$version-$release.tar."*
@ -235,9 +237,9 @@ pkg_sources() {
# Run in a subshell to keep the variables, path and # Run in a subshell to keep the variables, path and
# argument list local to each loop iteration. # argument list local to each loop iteration.
( (
repo_src=${src##git+} url=${src##git+}
log "$1" "Cloning ${repo_src%[@#]*}" log "$1" "Cloning ${url%[@#]*}"
# Git has no option to clone a repository to a # Git has no option to clone a repository to a
# specific location so we must do it ourselves # specific location so we must do it ourselves
@ -247,20 +249,18 @@ pkg_sources() {
# Clear the argument list as we'll be overwriting # Clear the argument list as we'll be overwriting
# it below based on what kind of checkout we're # it below based on what kind of checkout we're
# dealing with. # dealing with.
set -- "$repo_src" set -- "$url"
# If a branch was given, shallow clone it directly. # If a branch was given, shallow clone it directly.
# This speeds things up as we don't have to grab # This speeds things up as we don't have to grab
# a lot of unneeded commits. # a lot of unneeded commits.
[ "${src##*@*}" ] || [ "${src##*@*}" ] || set -- -b "${src##*@}" "${url%@*}"
set -- -b "${src##*@}" "${repo_src%@*}"
# Maintain compatibility with older versions of # Maintain compatibility with older versions of
# kiss by shallow cloning all branches. This has # kiss by shallow cloning all branches. This has
# the added benefit of allowing checkouts of # the added benefit of allowing checkouts of
# specific commits in specific branches. # specific commits in specific branches.
[ "${src##*#*}" ] || [ "${src##*#*}" ] || set -- --no-single-branch "${url%#*}"
set -- --no-single-branch "${repo_src%#*}"
# Always do a shallow clone as we will unshallow it if # Always do a shallow clone as we will unshallow it if
# needed later (when a commit is desired). # needed later (when a commit is desired).