aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoreply@github.com <noreply@github.com>2019-06-17 09:20:26 +0000
committernoreply@github.com <noreply@github.com>2019-06-17 09:20:26 +0000
commitd8fb4158e48b8abfb30893a4e93f55aae3758ac0 (patch)
treed01be47d26c3dbd6be4e62afdedc698aed85b1eb
parent1674a88b9152a541aec9981d2cd93c94049a635b (diff)
parent829e5095a3109e52fd8734d322f18c4ee96cdc2d (diff)
downloadcpt-d8fb4158e48b8abfb30893a4e93f55aae3758ac0.tar.gz
Merge branch 'master' into pkg_conflicts
FossilOrigin-Name: 866d797d1ba1526b620de4f31fabcdbe8532a442f7e9beba6bb69f87ef05e930
-rwxr-xr-xkiss6
1 files changed, 2 insertions, 4 deletions
diff --git a/kiss b/kiss
index 997bae9..7ab5e01 100755
--- a/kiss
+++ b/kiss
@@ -167,10 +167,8 @@ pkg_install() {
log "Removing previous version of package if it exists."
pkg_remove "$name"
-
+
"$cac_dir/tar" kpxf "$bin_dir/$pkg" -C "$sys_dir/"
- rm "$cac_dir/tar"
-
"$sys_db/$name/post-install" 2>/dev/null
log "Installed ${pkg%.tar.gz}"
@@ -261,7 +259,7 @@ args() {
}
main() {
- trap 'rm -rf -- "$mak_dir" "$pkg_dir"' EXIT INT
+ trap 'rm -rf -- "$mak_dir" "$pkg_dir" "$cac_dir/tar"' EXIT INT
kiss=${0##*/}
[ -z "$KISS_PATH" ] &&