bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: Fix conflicts

Browse Source
This commit is contained in:
Dylan Araps 2019-06-18 11:05:15 +03:00
commit c08797334f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiss
View File

@ -18,6 +18,10 @@ source_type() {
[ -z "${1##*://*}" ] && return 5 # Remote file. [ -z "${1##*://*}" ] && return 5 # Remote file.
} }
pkg_clean() {
rm -rf -- "$mak_dir" "$pkg_dir" "$cac_dir/manifest" "$cac_dir/tar"
}
pkg_search() { pkg_search() {
set -f set -f
# shellcheck disable=2086,2046 # shellcheck disable=2086,2046
@ -170,8 +174,6 @@ pkg_install() {
pkg_remove "$name" pkg_remove "$name"
"$cac_dir/tar" kpxf "$bin_dir/$pkg" -C "$sys_dir/" "$cac_dir/tar" kpxf "$bin_dir/$pkg" -C "$sys_dir/"
rm "$cac_dir/tar"
"$sys_db/$name/post-install" 2>/dev/null "$sys_db/$name/post-install" 2>/dev/null
log "Installed ${pkg%.tar.gz}" log "Installed ${pkg%.tar.gz}"
@ -262,7 +264,7 @@ args() {
} }
main() { main() {
trap 'rm -rf -- "$mak_dir" "$pkg_dir" "$cac_dir/manifest"' EXIT INT trap pkg_clean EXIT INT
kiss=${0##*/} kiss=${0##*/}
[ -z "$KISS_PATH" ] && [ -z "$KISS_PATH" ] &&