kiss-community
/
kiss
mirror of https://codeberg.org/kiss-community/kiss
1
0
Fork 1
Code Issues Wiki

kiss: swap to if tests

This commit is contained in:
Dylan Araps 2019-09-23 09:30:34 +03:00
parent 815e14d61e
commit 0c1188533f
1 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kiss
View File

@ -132,27 +132,24 @@ pkg_sources() {
repo_dir=$(pkg_find "$1") repo_dir=$(pkg_find "$1")
while read -r src _; do while read -r src _; do
case $src in # Remote source (cached).
# Remote source. if [ -f "${src##*/}" ]; then
*://*)
[ -f "${src##*/}" ] && {
log "$1" "Found cached source '${src##*/}'" log "$1" "Found cached source '${src##*/}'"
continue
}
# Remote source.
elif [ -z "${src##*://*}" ]; then
wget "$src" || { wget "$src" || {
rm -f "${src##*/}" rm -f "${src##*/}"
die "$1" "Failed to download $src" die "$1" "Failed to download $src"
} }
;;
# Local source. # Local source.
*) elif [ -f "$repo_dir/$src" ]; then
[ -f "$repo_dir/$src" ] || die "$1" "No local file '$src'"
log "$1" "Found local file '$src'" log "$1" "Found local file '$src'"
;;
esac else
die "$1" "No local file '$src'"
fi
done < "$repo_dir/sources" done < "$repo_dir/sources"
} }
@ -166,18 +163,15 @@ pkg_extract() {
while read -r src dest; do while read -r src dest; do
mkdir -p "$mak_dir/$1/$dest" && cd "$mak_dir/$1/$dest" mkdir -p "$mak_dir/$1/$dest" && cd "$mak_dir/$1/$dest"
case $src in
# Only 'tar' archives are currently supported for extraction. # Only 'tar' archives are currently supported for extraction.
# Any other file-types are simply copied to '$mak_dir' which # Any other file-types are simply copied to '$mak_dir' which
# allows for manual extraction. # allows for manual extraction.
*://*.tar*|*://*.tgz) if [ -z "${src##*.tar*}" ]; then
tar xf "$src_dir/$1/${src##*/}" --strip-components 1 \ tar xf "$src_dir/$1/${src##*/}" --strip-components 1 \
|| die "$1" "Couldn't extract ${src##*/}" || die "$1" "Couldn't extract ${src##*/}"
;;
*)
# Local file. # Local file.
if [ -f "$repo_dir/$src" ]; then elif [ -f "$repo_dir/$src" ]; then
cp -f "$repo_dir/$src" . cp -f "$repo_dir/$src" .
# Remote file. # Remote file.
@ -187,8 +181,6 @@ pkg_extract() {
else else
die "$1" "Local file $src not found" die "$1" "Local file $src not found"
fi fi
;;
esac
done < "$repo_dir/sources" done < "$repo_dir/sources"
} }