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

kiss: add missing case to etcsums. Print information to user.

Browse Source
This commit is contained in:
Dylan Araps 2020-02-19 17:05:41 +02:00
parent a4ee893169
commit 01714f9ad7
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
kiss
View File

@ -952,8 +952,9 @@ pkg_install() {
trap '' INT trap '' INT
# If the package is already installed (and this is an upgrade) make a # If the package is already installed (and this is an upgrade) make a
# backup of the manifest file. # backup of the manifest and etcsums files.
cp -f "$sys_db/$pkg_name/manifest" "$mak_dir/m" 2>/dev/null ||: cp -f "$sys_db/$pkg_name/manifest" "$mak_dir/m" 2>/dev/null ||:
cp -f "$sys_db/$pkg_name/etcsums" "$mak_dir/c" 2>/dev/null ||:
# 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() {
@ -979,22 +980,38 @@ pkg_install() {
{ {
sum_new=$(sha256sum "$file") sum_new=$(sha256sum "$file")
sum_sys=$(cd "$KISS_ROOT/"; sha256sum "$file") sum_sys=$(cd "$KISS_ROOT/"; sha256sum "$file")
sum_old=$("$grep" "$file$" "$sys_db/$pkg_name/etcsums") sum_old=$("$grep" "$file$" "$mak_dir/c")
} 2>/dev/null ||: } 2>/dev/null ||:
log "Doing 3-way handshake for $file"
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}${sum_new} in case ${sum_old:-null}${sum_sys:-null}${sum_new} in
# old = Y, sys = X, new = Y
${sum_new}${sum_sys}${sum_old})
log "Skipping $file."
continue
;;
# old = X, sys = X, new = X # old = X, sys = X, new = X
# old = X, sys = Y, new = Y # old = X, sys = Y, new = Y
# old = X, sys = X, new = Y # old = X, sys = X, new = Y
${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}*) new= ;; ${sum_sys}${sum_old}*)
log "Installing $file."
new=
;;
# All other cases. # All other cases.
*) log "$pkg_name" "WARN: saving /$file as /$file.new" *)
new=.new log "($pkg_name) WARN: saving /$file as /$file.new"
new=.new
;;
esac esac
cp -af "$file" "$KISS_ROOT/${file}${new}" cp -af "$file" "$KISS_ROOT/${file}${new}"