aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xkiss42
1 files changed, 39 insertions, 3 deletions
diff --git a/kiss b/kiss
index 12b6b21..ddc6db6 100755
--- a/kiss
+++ b/kiss
@@ -140,11 +140,29 @@ pkg_sources() {
repo_dir=$(pkg_find "$1")
- while read -r src _ || [ "$src" ]; do
+ while read -r src dest || [ "$src" ]; do
# Remote source (cached).
if [ -f "${src##*/}" ]; then
log "$1" "Found cached source '${src##*/}'"
+ # Remote git repository.
+ elif [ -z "${src##git+*}" ]; then
+ # This is a checksums check, skip it.
+ [ "$2" ] && continue
+
+ mkdir -p "$mak_dir/$1/$dest"
+
+ # Run in a subshell to keep variables local.
+ (
+ repo_src=${src##git+}
+
+ [ "${src##*#*}" ] && shallow=--depth=1
+
+ cd "$mak_dir/$1/$dest" &&
+ git clone "${shallow:---}" "${repo_src%#*}" .
+
+ ) || die "$1" "Failed to clone $src"
+
# Remote source.
elif [ -z "${src##*://*}" ]; then
curl "$src" -fLo "${src##*/}" || {
@@ -173,6 +191,19 @@ pkg_extract() {
mkdir -p "$mak_dir/$1/$dest" && cd "$mak_dir/$1/$dest"
case $src in
+ # Git repository with supplied commit hash.
+ git+*\#*)
+ log "Checking out ${src##*#}"
+
+ git reset --hard "${src##*#}" ||
+ die "Commit hash ${src##*#} doesn't exist"
+ ;;
+
+ # Git repository.
+ git+*)
+ continue
+ ;;
+
# Only 'tar' archives are currently supported for extraction.
# Any other file-types are simply copied to '$mak_dir' which
# allows for manual extraction.
@@ -566,6 +597,11 @@ pkg_checksums() {
elif [ -f "$src_dir/$1/${src##*/}" ]; then
src_path=$src_dir/$1
+ # File is a git repository.
+ elif [ -z "${src##git+*}" ]; then
+ printf '%-64s %s\n' git "${src##*/}"
+ continue
+
# Die here if source for some reason, doesn't exist.
else
die "$1" "Couldn't find source '$src'"
@@ -1002,7 +1038,7 @@ args() {
c|checksum)
for pkg; do pkg_lint "$pkg"; done
- for pkg; do pkg_sources "$pkg"; done
+ for pkg; do pkg_sources "$pkg" c; done
for pkg; do
pkg_checksums "$pkg" > "$(pkg_find "$pkg")/checksums"
@@ -1100,7 +1136,7 @@ main() {
# Prefer GNU grep if installed as it is much much faster than busybox's
# implementation. Very much worth it if you value performance over
# POSIX correctness.
- grep=$(command -v ggrep 2>/dev/null) || grep='grep'; : "${grep:=grep}"
+ grep=$(command -v ggrep) || grep='grep'
# This allows for automatic setup of a KISS chroot and will
# do nothing on a normal system.