kiss-community
/
kiss
mirror of https://codeberg.org/kiss-community/kiss
1
0
Fork 1
Code Issues Wiki

Merge pull request #110 from kisslinux/audit 

kiss: Add option to show diffs on update
This commit is contained in:
dylan 2020-02-09 11:39:00 +02:00 committed by GitHub
parent ed17fdfbab 83f91fee62
commit 6d6aafce42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -84,6 +84,14 @@ export KISS_RM=usr/share/doc:usr/share/gtk-doc:usr/share/info:usr/share/polkit-1
# Set it to '1' to force.
export KISS_FORCE=0
# Show diff on system updates.
#
# This will spawn '$PAGER' (fallback to 'less') with a diff
# of each changed file in the system update.
#
# Set it to '1' to enable.
export KISS_AUDIT=0
# Hook into kiss through a script.
#
# This can be used set custom CFLAGS per package, modify builds,

18
kiss
View File

@ -1034,6 +1034,11 @@ pkg_updates() {
# shellcheck disable=2046,2086
{ IFS=:; set -- $KISS_PATH; IFS=$old_ifs; }
# Where to store repository diffs for the update.
# At the same time, create the file so updates requiring root don't
# overwrite the user's existing permissions over the log.
:> "$mak_dir/log"
# Update each repository in '$KISS_PATH'. It is assumed that
# each repository is 'git' tracked.
for repo; do
@ -1065,6 +1070,7 @@ pkg_updates() {
if [ -w "$PWD" ] && [ "$(id -u)" != 0 ]; then
git fetch
git diff >> "$mak_dir/log"
git merge
else
@ -1078,12 +1084,15 @@ pkg_updates() {
# case that the repository is owned by a 3rd user.
(
user=$(stat -c %U "$PWD")
pull="git fetch && git diff >>'$mak_dir/log' && git merge"
[ "$user" = root ] ||
log "Dropping permissions to $user for pull"
as_root git fetch
as_root git merge
case $su in
su) as_root "$pull" ;;
*) as_root sh -c "$pull" ;;
esac
)
fi
}
@ -1136,6 +1145,11 @@ pkg_updates() {
log "Packages to update: ${outdated% }"
# Show a diff of each new change to the repositories.
# This spawns the user's set PAGER with a fallback to less.
[ -s "$mak_dir/log" ] && [ "$KISS_AUDIT" = 1 ] &&
"${PAGER:-less}" "$mak_dir/log"
# Tell 'pkg_build' to always prompt before build.
pkg_update=1

8
kiss.1
View File

@ -63,6 +63,14 @@ export KISS_RM=usr/share/doc:usr/share/gtk-doc:usr/share/info:usr/share/polkit-1
# Set it to '1' to force.
export KISS_FORCE=0
# Show diff on system updates.
#
# This will spawn '$PAGER' (fallback to 'less') with a diff
# of each changed file in the system update.
#
# Set it to '1' to enable.
export KISS_AUDIT=0
# Hook into kiss through a script.
#
# This can be used set custom CFLAGS per package, modify builds,