From 58b0272574749bcc04ebcbcd79f3d853bd9656d2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Mar 2020 11:59:15 +0200 Subject: [PATCH] kiss: Minor changes --- contrib/kiss-chroot | 3 ++- kiss | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/kiss-chroot b/contrib/kiss-chroot index 71bfbb2..258e793 100755 --- a/contrib/kiss-chroot +++ b/contrib/kiss-chroot @@ -20,6 +20,7 @@ clean() { log Cleaning leftover host files; { rm -f "$1/root/.ash_history" + rm -f "$1/etc/resolv.conf" } } @@ -38,7 +39,7 @@ main() { } log Copying /etc/resolv.conf from host; { - [ -f "$1/etc/resolv.conf" ] || cp /etc/resolv.conf "$1/etc" + cp -f /etc/resolv.conf "$1/etc" } log Entering chroot; { diff --git a/kiss b/kiss index 97bd646..77d5df7 100755 --- a/kiss +++ b/kiss @@ -98,7 +98,6 @@ decompress() { } pkg_lint() { - # Check that each mandatory file in the package entry exists. log "$1" "Checking repository files" cd "$(pkg_find "$1")" @@ -372,7 +371,8 @@ pkg_strip() { # Suppress errors here as some binaries and libraries may # fail to strip. This is OK. - strip "--strip-$strip_opt" "$file" 2>/dev/null ||: + strip "--strip-$strip_opt" "$file" 2>/dev/null && + printf 'Stripped %10s %s\n' "($strip_opt)" "${file##$pkg_dir/$1}" done }