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

Merge pull request #57 from kisslinux/ifsbaby

Browse Source 
Use if instead of case
This commit is contained in:
black 2019-09-23 09:40:52 +03:00 committed by GitHub
commit 1f089cc02c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
kiss
View File

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