From 6e72f4046a273d3188ca64df085fea6fb8ee2444 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Wed, 19 Jun 2019 06:20:37 +0000 Subject: kiss: Make temporary files unique. FossilOrigin-Name: 2ebaf2634a6dd7aa154dea8af4a18eb40fc6682fca2075f98d59e36871608435 --- kiss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kiss b/kiss index 3a7be73..3ddab81 100755 --- a/kiss +++ b/kiss @@ -21,7 +21,7 @@ source_type() { pkg_clean() { rm -rf -- "$mak_dir" "$pkg_dir" \ - "$cac_dir/manifest" "$cac_dir/tar" "$cac_dir/checksums" + "$cac_dir/manifest-$$" "$cac_dir/tar" "$cac_dir/checksums-$$" } pkg_search() { @@ -85,9 +85,9 @@ pkg_checksum() { } pkg_verify() { - pkg_checksum "$cac_dir/checksums" + pkg_checksum "$cac_dir/checksums-$$" - cmp -s "$cac_dir/checksums" checksums || + cmp -s "$cac_dir/checksums-$$" checksums || die "checksum mismatch, run '$kiss checksum $name'." } @@ -150,7 +150,7 @@ pkg_conflicts() { # Extract manifest from tarball and strip directories. tar xf "$bin_dir/$pkg" "./var/db/$kiss/$name/manifest" -O | while read -r line; do - [ "${line%%*/}" ] && printf '%s\n' "$line" >> "$cac_dir/manifest" + [ "${line%%*/}" ] && printf '%s\n' "$line" >> "$cac_dir/manifest-$$" done # Compare extracted manifest to all installed manifests. @@ -159,7 +159,7 @@ pkg_conflicts() { for db in "$sys_db"/*; do [ "$name" = "${db##*/}" ] && continue - grep -Fxf "$cac_dir/manifest" "$db/manifest" && + grep -Fxf "$cac_dir/manifest-$$" "$db/manifest" && die "Package '$name' conflicts with '${db##*/}'." done } -- cgit v1.2.3