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

kiss: ensure all reads exit on non-zero

Browse Source
This commit is contained in:
Dylan Araps 2021-06-28 10:02:01 +00:00
parent 9615784183
commit 95919dd875
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kiss
View File

@ -187,7 +187,8 @@ pkg_list() {
pkg_cache() { pkg_cache() {
# Find the tarball of a package using a glob. Use the first found match # Find the tarball of a package using a glob. Use the first found match
# of '<pkg_name>[#@]<pkg_version><pkg_release>.tar.*'. # of '<pkg_name>[#@]<pkg_version><pkg_release>.tar.*'.
read -r version release 2>/dev/null < "$(pkg_find "$1")/version" read -r version release 2>/dev/null < "$(pkg_find "$1")/version" ||
die "$1" "Failed to read version"
set +f set +f
set -f -- "$bin_dir/$1"[#@]"$version-$release.tar."* set -f -- "$bin_dir/$1"[#@]"$version-$release.tar."*
@ -574,7 +575,8 @@ pkg_tar() (
log "$1" "Creating tarball" log "$1" "Creating tarball"
# Read the version information to name the package. # Read the version information to name the package.
read -r version release < "$(pkg_find "$1")/version" read -r version release < "$(pkg_find "$1")/version" ||
die "$1" "Failed to read version"
# Use 'cd' to avoid needing tar's '-C' flag which may not be portable # Use 'cd' to avoid needing tar's '-C' flag which may not be portable
# across implementations. # across implementations.
@ -668,7 +670,8 @@ pkg_build() {
cd "$mak_dir/$pkg" cd "$mak_dir/$pkg"
# Log the version so we can pass it to the package build file. # Log the version so we can pass it to the package build file.
read -r build_version _ < "$repo_dir/version" read -r build_version _ < "$repo_dir/version" ||
die "$pkg" "Failed to read version"
log "$pkg" "Starting build" log "$pkg" "Starting build"
run_hook pre-build "$pkg" "$pkg_dir/$pkg" run_hook pre-build "$pkg" "$pkg_dir/$pkg"
@ -1391,8 +1394,11 @@ pkg_updates() {
set +f -- set +f --
for pkg in "$sys_db/"*; do for pkg in "$sys_db/"*; do
read -r db_ver db_rel < "$pkg/version" {
read -r re_ver re_rel < "$(pkg_find "${pkg##*/}")/version" read -r db_ver db_rel < "$pkg/version"
read -r re_ver re_rel < "$(pkg_find "${pkg##*/}")/version"
} || die "$pkg" "Failed to read version"
# Compare installed packages to repository packages. # Compare installed packages to repository packages.
[ "$db_ver-$db_rel" = "$re_ver-$re_rel" ] || { [ "$db_ver-$db_rel" = "$re_ver-$re_rel" ] || {