From 0e01dc27991fa0ba33f8fcd9b13aedace7f6f51a Mon Sep 17 00:00:00 2001 From: "herdiansyah@netc.eu" Date: Mon, 17 Jun 2019 13:25:15 +0000 Subject: pkg_manifest: sort before writing to manifest file FossilOrigin-Name: 2d43c274fd0f55149ce0423ec3727a71b8c8d63a1716fc36480d7645a012de20 --- 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() { -- cgit v1.2.3 From 1ae6616b0a4ea32c4e43f0abcc2a4153d7d6b4e7 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Mon, 17 Jun 2019 14:28:36 +0000 Subject: kiss: Fix bug when sources has a blank line. FossilOrigin-Name: c708631f8a85d400e3966545c031605b21986ff4da3ddc95abf8b184ff0cbdae --- 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. -- cgit v1.2.3 From f849603f6b1a23a95dfc4a3abf5602c5cf1e586d Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Mon, 17 Jun 2019 14:50:03 +0000 Subject: kiss: Surpress tar warnings. FossilOrigin-Name: 2d987f5524f94d39cce307cf2e09f0f09e31da0a84063b9561c9c62a7583d0c3 --- 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 -- cgit v1.2.3 From 3e0a2e254086f05adbafedb589d8943a7738695c Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Mon, 17 Jun 2019 18:04:59 +0000 Subject: kiss: Fix bug with duplicate dependencies. FossilOrigin-Name: 2b4c23d0ca6743380c8f2d5ca25fc076dd013d5c63e33bdb9d38307350935057 --- 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 ;; -- cgit v1.2.3 From 7c0a275efd6003294a882e64c30007952be26312 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Mon, 17 Jun 2019 18:06:50 +0000 Subject: kiss: Remove dependency type from missing output for now. FossilOrigin-Name: aeb758891a5cebf0b492583f2f7294776cd644002c1c65235cddd36f105d0b46 --- 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 -- cgit v1.2.3