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

kiss: Fix bug with removal of a non-repository package.

Browse Source
This commit is contained in:
Dylan Araps 2019-06-18 20:22:31 +03:00
parent a054792622
commit 7c01fcc347
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kiss
View File

@ -171,7 +171,7 @@ pkg_install() {
cp "$(command -v tar)" "$cac_dir" cp "$(command -v tar)" "$cac_dir"
log "Removing previous version of package if it exists." log "Removing previous version of package if it exists."
pkg_remove "$name" pkg_remove
"$cac_dir/tar" kpxf "$bin_dir/$pkg" -C "$sys_dir/" 2>/dev/null "$cac_dir/tar" kpxf "$bin_dir/$pkg" -C "$sys_dir/" 2>/dev/null
"$sys_db/$name/post-install" 2>/dev/null "$sys_db/$name/post-install" 2>/dev/null
@ -180,7 +180,7 @@ pkg_install() {
} }
pkg_remove() { pkg_remove() {
pkg_list "$name" || return 1 pkg_list "${1:-${name-null}}" || return 1
# Create a backup of 'rm' and 'rmdir' so they aren't # Create a backup of 'rm' and 'rmdir' so they aren't
# removed during package removal. # removed during package removal.
@ -195,7 +195,7 @@ pkg_remove() {
else else
"$cac_dir/rm" -f -- "$sys_dir$file" || log "Failed to remove $file." "$cac_dir/rm" -f -- "$sys_dir$file" || log "Failed to remove $file."
fi && log "Removed $file" fi && log "Removed $file"
done < "$sys_db/$name/manifest" done < "$sys_db/${1:-$name}/manifest"
# Use the backup of 'rm' to remove 'rmdir' and itself. # Use the backup of 'rm' to remove 'rmdir' and itself.
"$cac_dir/rm" "$cac_dir/rmdir" "$cac_dir/rm" "$cac_dir/rm" "$cac_dir/rmdir" "$cac_dir/rm"
@ -223,7 +223,7 @@ pkg_list() {
} }
args() { args() {
case $1 in b*|c*|i*|r*) pkg_setup "${2-null}"; esac case $1 in b*|c*|i*) pkg_setup "${2-null}"; esac
case $1 in case $1 in
b*) [ -f checksums ] || b*) [ -f checksums ] ||
die "Checksums missing, run '$kiss checksum $name'" die "Checksums missing, run '$kiss checksum $name'"
@ -250,7 +250,7 @@ args() {
pkg_install ;; pkg_install ;;
l*) pkg_list "$2" ;; l*) pkg_list "$2" ;;
r*) pkg_remove || die "Package '$name' not installed" ;; r*) pkg_remove "${2-null}" || die "Package '${2-null}' not installed." ;;
u*) pkg_updates ;; u*) pkg_updates ;;
*) log "$kiss [b|c|i|l|r|u] [pkg]" \ *) log "$kiss [b|c|i|l|r|u] [pkg]" \