kiss-community/kiss
1
0
Fork 1
mirror of https://codeberg.org/kiss-community/kiss synced 2024-09-28 12:22:39 -06:00
Code Issues Wiki

kiss: fix file parsing bug

Browse Source
This commit is contained in:
Dylan Araps 2019-11-14 01:31:52 +00:00
parent a81c46138f
commit 394a092c13
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kiss
View File

@ -142,7 +142,7 @@ pkg_sources() {
repo_dir=$(pkg_find "$1") repo_dir=$(pkg_find "$1")
while read -r src _; do while read -r src _ || [ -n "$src" ]; do
# Remote source (cached). # Remote source (cached).
if [ -f "${src##*/}" ]; then if [ -f "${src##*/}" ]; then
log "$1" "Found cached source '${src##*/}'" log "$1" "Found cached source '${src##*/}'"
@ -171,7 +171,7 @@ pkg_extract() {
repo_dir=$(pkg_find "$1") repo_dir=$(pkg_find "$1")
while read -r src dest; do while read -r src dest || [ -n "$src" ]; 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 case $src in
@ -214,7 +214,7 @@ pkg_depends() {
(pkg_list "$1" >/dev/null) && return (pkg_list "$1" >/dev/null) && return
# Recurse through the dependencies of the child packages. # Recurse through the dependencies of the child packages.
while read -r dep _; do while read -r dep _ || [ -n "$dep" ]; do
[ "${dep##\#*}" ] && pkg_depends "$dep" [ "${dep##\#*}" ] && pkg_depends "$dep"
done 2>/dev/null < "$repo_dir/depends" ||: done 2>/dev/null < "$repo_dir/depends" ||:
@ -548,7 +548,7 @@ pkg_checksums() {
repo_dir=$(pkg_find "$1") repo_dir=$(pkg_find "$1")
while read -r src _; do while read -r src _ || [ -n "$src" ]; do
# File is local to the package. # File is local to the package.
if [ -f "$repo_dir/$src" ]; then if [ -f "$repo_dir/$src" ]; then
src_path=$repo_dir/${src%/*} src_path=$repo_dir/${src%/*}
@ -690,7 +690,7 @@ pkg_install() {
# installing the package. # installing the package.
[ -f "$tar_dir/$pkg_name/$pkg_db/$pkg_name/depends" ] && [ -f "$tar_dir/$pkg_name/$pkg_db/$pkg_name/depends" ] &&
[ -z "$KISS_FORCE" ] && [ -z "$KISS_FORCE" ] &&
while read -r dep dep_type; do while read -r dep dep_type || [ -n "$dep" ]; do
[ "${dep##\#*}" ] || continue [ "${dep##\#*}" ] || continue
[ "$dep_type" ] || pkg_list "$dep" >/dev/null || [ "$dep_type" ] || pkg_list "$dep" >/dev/null ||
install_dep="$install_dep'$dep', " install_dep="$install_dep'$dep', "