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

kiss: Added dependency check on package removal.

Browse Source
This commit is contained in:
Dylan Araps 2019-07-04 17:25:28 +03:00
parent 9792df69f5
commit 82b7db05b6
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
kiss
View File

@ -565,28 +565,38 @@ pkg_remove() {
cp "$(command -v rm)" "$cac_dir" cp "$(command -v rm)" "$cac_dir"
cp "$(command -v rmdir)" "$cac_dir" cp "$(command -v rmdir)" "$cac_dir"
for pkg; do # The package is not installed, don't do anything.
# The package is not installed, don't do anything. pkg_list "$1" >/dev/null || {
pkg_list "$pkg" >/dev/null || { log "[$1]: Not installed."
log "[$pkg]: Not installed." return
continue }
}
while read -r file; do # Make sure that nothing depends on this package.
# The file is in '/etc' skip it. This prevents the package [ "$2" = check ] && for file in "$KISS_ROOT/var/db/kiss/"*; do
# manager from removing user edited configuration files. # Check each depends file for the package and if it's
[ "${file##/etc/*}" ] || continue # a run-time dependency, append to the $required_by string.
grep -q "^$1$" "$file/depends" 2>/dev/null &&
if [ -d "$KISS_ROOT/$file" ]; then required_by="$required_by${file##*/}, "
"$cac_dir/rmdir" "$KISS_ROOT/$file" 2>/dev/null || continue
else
"$cac_dir/rm" -f -- "$KISS_ROOT/$file" ||
log "[$pkg]: Failed to remove '$file'."
fi
done < "$KISS_ROOT/var/db/kiss/$pkg/manifest"
log "[$pkg]: Removed successfully."
done done
[ "$required_by" ] &&
die "[$1]: Package is required by ${required_by%, }." \
"[$1]: Aborting here..."
while read -r file; do
# The file is in '/etc' skip it. This prevents the package
# manager from removing user edited configuration files.
[ "${file##/etc/*}" ] || continue
if [ -d "$KISS_ROOT/$file" ]; then
"$cac_dir/rmdir" "$KISS_ROOT/$file" 2>/dev/null || continue
else
"$cac_dir/rm" -f -- "$KISS_ROOT/$file" ||
log "[$1]: Failed to remove '$file'."
fi
done < "$KISS_ROOT/var/db/kiss/$1/manifest"
log "[$1]: Removed successfully."
} }
pkg_install() { pkg_install() {
@ -643,6 +653,7 @@ pkg_install() {
log "[$pkg_name]: Removing previous version of package if it exists." log "[$pkg_name]: Removing previous version of package if it exists."
pkg_remove "$pkg_name" pkg_remove "$pkg_name"
log "[$pkg_name]: Installing package..."
# Installation works by unpacking the tar-ball to a specified location, # Installation works by unpacking the tar-ball to a specified location,
# manually running 'mkdir' to create each directory and finally, using # manually running 'mkdir' to create each directory and finally, using
@ -814,7 +825,7 @@ args() {
shift shift
[ "$1" ] || die "'kiss remove' requires an argument." [ "$1" ] || die "'kiss remove' requires an argument."
root_check root_check
pkg_remove "$@" for pkg; do pkg_remove "$pkg" check; done
;; ;;
# List installed packages. # List installed packages.