kiss-community/kiss
1
0
Fork 1
mirror of https://codeberg.org/kiss-community/kiss synced 2024-12-24 16:10:05 -07:00
Code Issues Wiki

kiss: clean up

Browse Source
This commit is contained in:
Dylan Araps 2020-09-14 15:59:48 +03:00
parent 92dbdbe06a
commit fc699ff91f
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kiss
View File

@ -754,9 +754,6 @@ pkg_verify() {
} }
pkg_conflicts() { pkg_conflicts() {
# Check to see if a package conflicts with another.
log "$1" "Checking for package conflicts"
# Filter the tarball's manifest and select only files. Resolve all # Filter the tarball's manifest and select only files. Resolve all
# symlinks in file paths as well. # symlinks in file paths as well.
while read -r file; do while read -r file; do
@ -1020,22 +1017,15 @@ pkg_remove_files() {
pkg_etc_file() { pkg_etc_file() {
pkg_etc_cnt=$((pkg_etc_cnt + 1)) pkg_etc_cnt=$((pkg_etc_cnt + 1))
log "$pkg" "Doing 3-way handshake for $2"
sum_new=$(sh256 "$1/$2") 2>/dev/null ||: sum_new=$(sh256 "$1/$2") 2>/dev/null ||:
sum_sys=$(cd "$KISS_ROOT/"; sh256 "$2") 2>/dev/null ||: sum_sys=$(cd "$KISS_ROOT/"; sh256 "$2") 2>/dev/null ||:
sum_old=$(awk "NR == $pkg_etc_cnt" "$mak_dir/c") 2>/dev/null ||: sum_old=$(awk "NR == $pkg_etc_cnt" "$mak_dir/c") 2>/dev/null ||:
printf '%s\n' "Previous: ${sum_old:-null}"
printf '%s\n' "System: ${sum_sys:-null}"
printf '%s\n' "New: ${sum_new:-null}"
# Use a case statement to easily compare three strings at # Use a case statement to easily compare three strings at
# the same time. Pretty nifty. # the same time. Pretty nifty.
case ${sum_old:-null}${sum_sys:-null}${sum_new} in case ${sum_old:-null}${sum_sys:-null}${sum_new} in
# old = Y, sys = X, new = Y # old = Y, sys = X, new = Y
"${sum_new}${sum_sys}${sum_old}") "${sum_new}${sum_sys}${sum_old}")
log "Skipping $2"
return 0 return 0
;; ;;
@ -1045,13 +1035,12 @@ pkg_etc_file() {
"${sum_old}${sum_old}${sum_old}"|\ "${sum_old}${sum_old}${sum_old}"|\
"${sum_old:-null}${sum_sys}${sum_sys}"|\ "${sum_old:-null}${sum_sys}${sum_sys}"|\
"${sum_sys}${sum_old}"*) "${sum_sys}${sum_old}"*)
log "Installing $2"
new= new=
;; ;;
# All other cases. # All other cases.
*) *)
war "$pkg" "saving /$2 as /$2.new" printf 'Saving /%s as /%s.new\n' "$2" "$2"
new=.new new=.new
;; ;;
esac esac
@ -1132,7 +1121,7 @@ pkg_install() {
( (
KISS_PATH=$tar_dir/$pkg/$pkg_db:$KISS_PATH KISS_PATH=$tar_dir/$pkg/$pkg_db:$KISS_PATH
pkg_depends "$pkg" explicit 2>/dev/null ||: pkg_depends "$pkg" explicit runtime 2>/dev/null ||:
[ -z "$deps" ] || die "$pkg" "Missing $deps" [ -z "$deps" ] || die "$pkg" "Missing $deps"
) )