bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

contrib: Fix portability issues

Browse Source
This commit is contained in:
Dylan Araps 2020-05-15 09:58:16 +03:00
parent dff30f569c
commit e43dd77469
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
3 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/kiss-chbuild
View File

@ -14,6 +14,24 @@ die() {
exit 1
}
sh256() {
# There's no standard utility to generate sha256 checksums.
# This is a simple wrapper around sha256sum, sha256, shasum
# and openssl which will use whatever is available.
#
# All utilities must match 'sha256sum' output.
#
# Example: '<checksum> <file>'
[ -e "$1" ] || return 0
hash=$(sha256sum "$1" ||
sha256 -r "$1" ||
openssl dgst -sha256 -r "$1" ||
shasum -a 256 "$1")
printf '%s %s\n' "${hash%% *}" "$1"
} 2>/dev/null
cd "${cac_dir:=$KISS_ROOT${XDG_CACHE_HOME:-$HOME/.cache}/kiss}"
url=https://github.com/kisslinux/repo/releases/download/1.10.0/
@ -30,7 +48,7 @@ url=https://github.com/kisslinux/repo/releases/download/1.10.0/
}
log "Verifying checksums"
sha256sum -c < kiss-chroot.tar.xz.sha256 ||
sh256 kiss-chroot.tar.xz | diff - kiss-chroot.tar.xz.sha256 ||
die "Checksum verification failed."
[ -d kiss-chroot ] || {

22
contrib/kiss-chroot
View File

@ -24,6 +24,20 @@ clean() {
}
}
mounted() {
# This is a pure shell mountpoint implementation. We're dealing
# with basic (and fixed/known) input so this doesn't need to
# handle more complex cases.
[ -e "$1" ] || return 1
[ -e /proc/mounts ] || return 1
while read -r _ target _; do
[ "$target" = "$1" ] && return 0
done < /proc/mounts
return 1
}
[ -z "$1" ] && die Need a path to the chroot
[ -d "$1" ] || die Given path does not exist
[ "$(id -u)" = 0 ] || die Script needs to be run as root
@ -31,11 +45,11 @@ clean() {
trap 'clean "$1"' EXIT INT
log Mounting /dev, /proc and /sys from host; {
mountpoint -q "$1/dev" || mount -o bind /dev "$1/dev"
mountpoint -q "$1/proc" || mount -t proc proc "$1/proc"
mountpoint -q "$1/sys" || mount -t sysfs sys "$1/sys"
mounted "$1/dev" || mount -o bind /dev "$1/dev"
mounted "$1/proc" || mount -t proc proc "$1/proc"
mounted "$1/sys" || mount -t sysfs sys "$1/sys"
mountpoint -q "$1/sys/firmware/efi/efivars" ||
mounted "$1/sys/firmware/efi/efivars" ||
mount -t efivarfs efivarfs "$1/sys/firmware/efi/efivars" 2>/dev/null ||:
}

22
contrib/kiss-export
View File

@ -12,7 +12,7 @@
read -r ver rel 2>/dev/null < "$KISS_ROOT/var/db/kiss/installed/$1/version"
# Reset the argument list.
pkg=$1
pkg=$1 pwd=$PWD
set --
# Construct the argument list using each file.
@ -20,12 +20,16 @@ while read -r 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 cf - -C / -- "$@" | case ${KISS_COMPRESS:-gz} in
bz2) bzip2 -z ;;
gz) gzip -6 ;;
xz) xz -zT 0 ;;
zst) zstd -z ;;
esac > "$pkg#$ver-$rel.tar.${KISS_COMPRESS:-gz}"
cd "$KISS_ROOT/"
printf 'tarball created in %s\n' "$PWD/$pkg#$ver-$rel.tar.${KISS_COMPRESS:-gz}"
# Turn the list of files back into a package.
tar cf - "$@" | case ${KISS_COMPRESS:-gz} in
bz2) bzip2 -z ;;
gz) gzip -6 ;;
lzma) lzma -z ;;
lz) lzip -z ;;
xz) xz -zT 0 ;;
zst) zstd -z ;;
esac > "$pwd/$pkg#$ver-$rel.tar.${KISS_COMPRESS:-gz}"
printf 'tarball created in %s\n' "$pwd/$pkg#$ver-$rel.tar.${KISS_COMPRESS:-gz}"