contrib: clean up
This commit is contained in:
parent
a4d26034c7
commit
7b36eb0f99
|
@ -8,6 +8,7 @@ log() {
|
||||||
|
|
||||||
clean() {
|
clean() {
|
||||||
log "Destroying chroot"
|
log "Destroying chroot"
|
||||||
|
|
||||||
su -c "rm -rf chroot-$pid" || clean
|
su -c "rm -rf chroot-$pid" || clean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,8 @@
|
||||||
#
|
#
|
||||||
# kiss-depends - Display a package's dependencies.
|
# kiss-depends - Display a package's dependencies.
|
||||||
|
|
||||||
db_dir=$KISS_ROOT/var/db/kiss/installed/${1-null}
|
kiss l "${1:-null}" >/dev/null
|
||||||
|
|
||||||
# Check if package is installed and exit if it is not.
|
db_dir=$KISS_ROOT/var/db/kiss/installed/${1:-null}
|
||||||
[ -d "$db_dir" ] || {
|
|
||||||
printf '%s\n' "error: '$1' not installed." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
[ -f "$db_dir/depends" ] && cat "$db_dir/depends"
|
cat "$db_dir/depends" 2>/dev/null
|
||||||
|
|
|
@ -1,46 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
#
|
|
||||||
# Find missing dependencies by parsing 'ldd'.
|
|
||||||
|
|
||||||
db_dir=$KISS_ROOT/var/db/kiss/installed
|
|
||||||
|
|
||||||
# Check if package is installed and exit if it is not.
|
|
||||||
[ -d "$db_dir/${1-null}" ] || {
|
|
||||||
printf '%s\n' "error: '$1' not installed." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
printf '%s\n' "=> Detected dependencies:"
|
|
||||||
|
|
||||||
while read -r file; do
|
|
||||||
# Skip directories.
|
|
||||||
[ -d "$KISS_ROOT/$file" ] && continue
|
|
||||||
|
|
||||||
ldd "$KISS_ROOT/$file" 2>/dev/null | while read -r dep; do
|
|
||||||
# Skip lines containing 'ldd'.
|
|
||||||
[ "${dep##*ldd*}" ] || continue
|
|
||||||
|
|
||||||
# Extract the file path from 'ldd' output.
|
|
||||||
dep=${dep#* => }
|
|
||||||
dep=${dep% *}
|
|
||||||
|
|
||||||
# Traverse symlinks to get the true path to the file.
|
|
||||||
pkg=$(readlink -f "$KISS_ROOT/${dep##$KISS_ROOT}")
|
|
||||||
|
|
||||||
# Figure out which package owns the file.
|
|
||||||
pkg=$(grep -lFx "${pkg##$KISS_ROOT}" "$db_dir/"*/manifest)
|
|
||||||
pkg=${pkg%/*}
|
|
||||||
pkg=${pkg##*/}
|
|
||||||
|
|
||||||
case $pkg in
|
|
||||||
# Skip listing these packages as dependencies.
|
|
||||||
musl|gcc|$1) ;;
|
|
||||||
*) printf '%s\n' "$pkg" ;;
|
|
||||||
esac
|
|
||||||
done &
|
|
||||||
done < "$db_dir/$1/manifest" | sort | uniq
|
|
||||||
|
|
||||||
printf '\n%s\n' "=> Package dependencies:"
|
|
||||||
|
|
||||||
[ -f "$db_dir/$1/depends" ] &&
|
|
||||||
cat "$db_dir/$1/depends"
|
|
|
@ -2,16 +2,22 @@
|
||||||
#
|
#
|
||||||
# kiss-export - Turn an installed package into a KISS tarball.
|
# kiss-export - Turn an installed package into a KISS tarball.
|
||||||
|
|
||||||
read -r ver rel 2>/dev/null < "$KISS_ROOT/var/db/kiss/installed/$1/version" || {
|
kiss l "${1:-null}" >/dev/null
|
||||||
printf '%s\n' "error: '$1' is not installed." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# This warning is safe to ignore as globs are disabled and
|
# Grab the package's version..
|
||||||
# word splitting is intentional.
|
read -r ver rel 2>/dev/null < \
|
||||||
# shellcheck disable=2046
|
"$KISS_ROOT/var/db/kiss/installed/$1/version"
|
||||||
tar czvf "$1#$ver-$rel.tar.gz" -C / -- $(
|
|
||||||
while read -r file; do
|
# Reset the argument list.
|
||||||
[ -d "$KISS_ROOT/$file" ] || printf '%s\n' ".$file"
|
pkg=$1
|
||||||
done < "$KISS_ROOT/var/db/kiss/installed/$1/manifest"
|
set --
|
||||||
)
|
|
||||||
|
# Construct the argument list using each file.
|
||||||
|
while read -r file || [ "$file" ]; do
|
||||||
|
[ -d "$KISS_ROOT/$file" ] || set -- "$@" ".$file"
|
||||||
|
done < "$KISS_ROOT/var/db/kiss/installed/$pkg/manifest"
|
||||||
|
|
||||||
|
# Turn the list of files back into a package.
|
||||||
|
tar czf "$pkg#$ver-$rel.tar.gz" -C / -- "$@"
|
||||||
|
|
||||||
|
printf 'tarball created in %s\n' "$PWD/$pkg#$ver-$rel.tar.gz"
|
||||||
|
|
|
@ -2,12 +2,8 @@
|
||||||
#
|
#
|
||||||
# kiss-manifest - Display all files owned by a package.
|
# kiss-manifest - Display all files owned by a package.
|
||||||
|
|
||||||
db_dir=$KISS_ROOT/var/db/kiss/installed/${1-null}
|
kiss l "${1:-null}" >/dev/null
|
||||||
|
|
||||||
# Check if package is installed and exit if it is not.
|
db_dir=$KISS_ROOT/var/db/kiss/installed/${1:-null}
|
||||||
[ -d "$db_dir" ] || {
|
|
||||||
printf '%s\n' "error: '$1' not installed." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
cat "$db_dir/manifest"
|
cat "$db_dir/manifest" 2>/dev/null
|
||||||
|
|
|
@ -2,13 +2,9 @@
|
||||||
#
|
#
|
||||||
# kiss-manifest-tree - Display all files owned by a package.
|
# kiss-manifest-tree - Display all files owned by a package.
|
||||||
|
|
||||||
db_dir=$KISS_ROOT/var/db/kiss/installed/${1-null}
|
kiss l "${1:-null}"
|
||||||
|
|
||||||
# Check if package is installed and exit if it is not.
|
db_dir=$KISS_ROOT/var/db/kiss/installed/${1:-null}
|
||||||
[ -d "$db_dir" ] || {
|
|
||||||
printf '%s\n' "error: '$1' not installed." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
printf '%s\n' "[$1]:"
|
printf '%s\n' "[$1]:"
|
||||||
tree -C --fromfile "$db_dir/manifest" | tail -n +2
|
tree -C --fromfile "$db_dir/manifest" | tail -n +2
|
||||||
|
|
|
@ -5,12 +5,10 @@
|
||||||
cd "$KISS_ROOT/var/db/kiss/installed/"
|
cd "$KISS_ROOT/var/db/kiss/installed/"
|
||||||
|
|
||||||
for pkg in *; do
|
for pkg in *; do
|
||||||
# Skip these packages.
|
|
||||||
case $pkg in
|
case $pkg in
|
||||||
baseinit|baselayout|gcc|pkgconf|e2fsprogs|\
|
baseinit|baselayout|gcc|pkgconf|e2fsprogs|musl|\
|
||||||
make|busybox|bzip2|grub|automake)
|
make|busybox|bzip2|grub|automake|kiss|rsync|git)
|
||||||
continue
|
continue
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
grep -q "^$pkg$" ./*/depends || printf '%s\n' "$pkg"
|
grep -q "^$pkg$" ./*/depends || printf '%s\n' "$pkg"
|
||||||
|
|
|
@ -5,16 +5,17 @@
|
||||||
#
|
#
|
||||||
# kiss-reset: Remove all packages except for the base.
|
# kiss-reset: Remove all packages except for the base.
|
||||||
|
|
||||||
set -- \
|
set --
|
||||||
$(kiss l | while read -r pkg _; do
|
|
||||||
case $pkg in
|
|
||||||
baselayout|binutils|bison|busybox|bzip2|curl|flex|gcc|git|\
|
|
||||||
gzip|kiss|libelf|libressl|linux-headers|m4|make|mandoc|musl|\
|
|
||||||
perl|pkgconf|rsync|xz|zlib) ;;
|
|
||||||
|
|
||||||
*) printf '%s\n' "$pkg" ;;
|
kiss l | while read -r pkg _; do
|
||||||
esac
|
case $pkg in
|
||||||
done)
|
baselayout|binutils|bison|busybox|bzip2|curl|flex|gcc|git|\
|
||||||
|
gzip|kiss|libelf|libressl|linux-headers|m4|make|musl|perl|\
|
||||||
|
pkgconf|rsync|xz|zlib) ;;
|
||||||
|
|
||||||
|
*) set -- "$@" "$pkg" ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
[ "$1" ] && {
|
[ "$1" ] && {
|
||||||
printf 'WARNING: This will remove \033[1m%s\033[m package(s).\n' "$#"
|
printf 'WARNING: This will remove \033[1m%s\033[m package(s).\n' "$#"
|
||||||
|
|
Loading…
Reference in New Issue