From 3e0e12f95ad06ab86ef9c659cad1c35f6093532b Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Mon, 17 Jun 2019 20:25:15 +0700 Subject: [PATCH 1/5] pkg_manifest: sort before writing to manifest file --- kiss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiss b/kiss index be18415..d2c2bbd 100755 --- a/kiss +++ b/kiss @@ -126,7 +126,7 @@ pkg_strip() { pkg_manifest() { (cd "$pkg_dir" && find ./*) | sed -e ss.ss -e '1!G;h;$!d' | - tee manifest > "$pkg_db/$name/manifest" + sort | tee manifest > "$pkg_db/$name/manifest" } pkg_tar() { From fd6c5c4507595f734cdb1ebdd132a7fe32a1da7e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 17 Jun 2019 17:28:37 +0300 Subject: [PATCH 2/5] kiss: Fix bug when sources has a blank line. --- kiss | 1 + 1 file changed, 1 insertion(+) diff --git a/kiss b/kiss index d2c2bbd..8cca5e5 100755 --- a/kiss +++ b/kiss @@ -12,6 +12,7 @@ log() { } source_type() { + [ -z "$1" ] && return 1 # No file. [ -f "$1" ] && return 2 # Local file. [ -f "$src_dir/${1##*/}" ] && return 3 # Cached downloaded file. [ -z "${1##git:*}" ] && return 4 # Git repository. From 5bf813f48aa77a10048cdc896170a71335028bc3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 17 Jun 2019 17:50:03 +0300 Subject: [PATCH 3/5] kiss: Surpress tar warnings. --- kiss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiss b/kiss index 8cca5e5..85e012e 100755 --- a/kiss +++ b/kiss @@ -143,7 +143,7 @@ pkg_install() { cp "$(command -v tar)" "$cac_dir" pkg_remove "$name" - "$cac_dir/tar" kpxvf "$bin_dir/$pkg" -C "$sys_dir/" + "$cac_dir/tar" kpxvf "$bin_dir/$pkg" -C "$sys_dir/" 2>/dev/null "$sys_db/$name/post-install" 2>/dev/null From 85a7437ced3af9944f28e4b64ad38ae49f7a4b71 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 17 Jun 2019 21:05:00 +0300 Subject: [PATCH 4/5] kiss: Fix bug with duplicate dependencies. --- kiss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiss b/kiss index 85e012e..26f7fdb 100755 --- a/kiss +++ b/kiss @@ -47,7 +47,7 @@ pkg_depends() { [ "$1" = install ] && [ "$opt" = make ] && continue case $missing in - *" $dep${opt:+ ($opt)},"*) ;; + *" $dep "*,) ;; *) missing="$missing $dep${opt:+ ($opt)}," pkg_setup "$dep" pkg_depends ;; From 7aa92c741635a08fd8b708254fe46b58910899ca Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 17 Jun 2019 21:06:51 +0300 Subject: [PATCH 5/5] kiss: Remove dependency type from missing output for now. --- kiss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kiss b/kiss index 26f7fdb..ab88cc9 100755 --- a/kiss +++ b/kiss @@ -47,8 +47,8 @@ pkg_depends() { [ "$1" = install ] && [ "$opt" = make ] && continue case $missing in - *" $dep "*,) ;; - *) missing="$missing $dep${opt:+ ($opt)}," + *" $dep,"*) ;; + *) missing="$missing $dep," pkg_setup "$dep" pkg_depends ;; esac