cpt

[ARCHIVED] Carbs Packaging Tools
git clone git://git.ckyln.com/~cem/cpt.git
Log | Files | Refs | README | LICENSE

commit 55bcaede5241480a87f9b74081df0aef11957c51
parent 9c5b12ad916ef84e9b38b521f0b629a4a723b48b
Author: Dylan Araps <dylan.araps@gmail.com>
Date:   Thu, 20 Feb 2020 11:52:35 +0200

kiss: Drop KISS_AUDIT for now.

I'm going to re-implement this feature in a
smarter way. It doesn't currently work for
partial updates nor does it work at all for
some users.

Some kind of persistent logging would be
far better as we'll be able to view a diff
regardless of the current pull's status.

The best way of doing this will be to grab
a diff of each package pending an update.
This way it's only information useful to
the user.

Fun stuff.

Diffstat:
MREADME.md | 8--------
Mkiss | 15+--------------
Mkiss.1 | 8--------
3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/README.md b/README.md @@ -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, diff --git a/kiss b/kiss @@ -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 diff --git a/kiss.1 b/kiss.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,