From fa7a076174c00d1954b085424763fd12e4ae4b88 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Tue, 10 Sep 2019 08:34:39 +0000 Subject: kiss: cleanup FossilOrigin-Name: dc52a1305bb2cfa0bdbec7466870cf51cbfde5d8dd28f01a9e4310d3971ae0e7 --- kiss | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/kiss b/kiss index 8c9cebe..cd7ed7b 100755 --- a/kiss +++ b/kiss @@ -531,33 +531,28 @@ pkg_build() { pkg_checksums() { # Generate checksums for packages. - repo_dir=$(pkg_find "$1") while read -r src _; do case $src in *) - # File is local to the package and is stored in the - # repository. - [ -f "$repo_dir/$src" ] && + # File is local to the package. + if [ -f "$repo_dir/$src" ]; then src_path=$repo_dir/${src%/*} # File is remote and was downloaded. - [ -f "$src_dir/$1/${src##*/}" ] && + elif [ -f "$src_dir/$1/${src##*/}" ]; then src_path=$src_dir/$1 # Die here if source for some reason, doesn't exist. - [ "$src_path" ] || + else die "[$1] Couldn't find source '$src'" + fi # An easy way to get 'sha256sum' to print with the 'basename' # of files is to 'cd' to the file's directory beforehand. (cd "$src_path" && sha256sum "${src##*/}") || die "[$1] Failed to generate checksums" - - # Unset this variable so it isn't used again on a failed - # source. There's no 'local' keyword in POSIX sh. - src_path= ;; esac done < "$repo_dir/sources" -- cgit v1.2.3