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

kiss: fix bug with repository files polluting '/' (harmless but annoying)

Browse Source
This commit is contained in:
Dylan Araps 2019-09-11 22:40:01 +03:00
parent fa314cc4a2
commit 74365ae55c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kiss
View File

@ -534,7 +534,6 @@ pkg_conflicts() {
# Check to see if a package conflicts with another. # Check to see if a package conflicts with another.
log "[$2] Checking for package conflicts" log "[$2] Checking for package conflicts"
cd "$sys_db"
set +ef set +ef
# Extract manifest from tarball and only print files which # Extract manifest from tarball and only print files which
@ -551,7 +550,7 @@ pkg_conflicts() {
# If the generated manifest contains matches, check the # If the generated manifest contains matches, check the
# contents for conflicts. # contents for conflicts.
[ -s "$cac_dir/$pid-m" ] && [ -s "$cac_dir/$pid-m" ] &&
grep -Fxf "$cac_dir/$pid-m" -- */manifest && grep -Fxf "$cac_dir/$pid-m" -- "$sys_db"/*/manifest &&
die "Package '$2' conflicts with another package" die "Package '$2' conflicts with another package"
set -ef set -ef
@ -679,7 +678,7 @@ pkg_install() {
# This is repeated multiple times. Better to make it a function. # This is repeated multiple times. Better to make it a function.
pkg_rsync() { pkg_rsync() {
rsync --chown=root:root -WhHKa --no-compress "$1" --exclude etc -- \ rsync --chown=root:root -WhHKa --no-compress "$1" --exclude etc \
"$tar_dir/$pkg_name/" "$KISS_ROOT/" "$tar_dir/$pkg_name/" "$KISS_ROOT/"
} }
@ -726,8 +725,8 @@ pkg_install() {
# Install the package again to fix any non-leftover files being # Install the package again to fix any non-leftover files being
# removed above. # removed above.
pkg_rsync ||: pkg_rsync -v ||:
pkg_rsync ||: pkg_rsync -v ||:
# Reset 'trap' to its original value. Installation is done so # Reset 'trap' to its original value. Installation is done so
# we no longer need to block 'Ctrl+C'. # we no longer need to block 'Ctrl+C'.
@ -972,7 +971,7 @@ args() {
;; ;;
v|version|-v|--version) v|version|-v|--version)
printf 'kiss 0.20.2\n' printf 'kiss 0.21.0\n'
;; ;;
h|help|-h|--help|'') h|help|-h|--help|'')