diff options
-rw-r--r-- | README.md | 8 | ||||
-rwxr-xr-x | kiss | 15 | ||||
-rw-r--r-- | kiss.1 | 8 |
3 files changed, 1 insertions, 30 deletions
@@ -78,14 +78,6 @@ export KISS_PATH=/var/db/kiss/repo/core:/var/db/kiss/repo/extra:/var/db/kiss/rep # 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, @@ -1061,11 +1061,6 @@ 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 @@ -1097,7 +1092,6 @@ pkg_updates() { if [ -w "$PWD" ] && [ "$uid" != 0 ]; then git fetch - git diff >> "$mak_dir/log" git merge else @@ -1111,16 +1105,14 @@ 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" case $su in - su) as_root "$pull" ;; + su) as_root "git fetch && git merge" ;; *) "$su" git fetch - "$su" git diff >> "$mak_dir/log" "$su" git merge esac ) @@ -1171,11 +1163,6 @@ 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 @@ -54,14 +54,6 @@ export KISS_PATH=/var/db/kiss/repo/core:/var/db/kiss/repo/extra:/var/db/kiss/rep # 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, |