RepoMirrors/abuild
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git synced 2025-04-11 03:32:04 +00:00
Code Issues Projects Releases Wiki Activity

abuild: fix eval argument splitting and simplify

Browse Source 
A newline starts a new command in shell scripts and eval uses the shell
grammar. Use a space instead to fix multiline repo templates.

Also avoid one subshell.
This commit is contained in:
Sertonix 2024-10-10 14:40:30 +02:00
parent 9c4abc561e
commit 1d9568b669
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
abuild.in
View File

@ -2366,9 +2366,9 @@ apk_add_makedeps() {
shift shift
repo_args="--repository $(shell_escape "$REPODEST/$repo")" repo_args="--repository $(shell_escape "$REPODEST/$repo")"
[ -s "$repo_template" ] && repo_args=$(while read r; do [ -s "$repo_template" ] && while read r; do
printf %s\\n "--repository $(shell_escape "$REPODEST/${r##*/}")" repo_args="$repo_args --repository $(shell_escape "$REPODEST/${r##*/}")"
done) < "$repo_template" done < "$repo_template"
eval "$SUDO_APK" add "$apk_opt_wait" "$repo_args" \ eval "$SUDO_APK" add "$apk_opt_wait" "$repo_args" \
--virtual .${prefix}depends-$pkgname "\$@" || return --virtual .${prefix}depends-$pkgname "\$@" || return