moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

repo-add: fix eval and quote issues 

eval was ugly and dirty, and bit us here. Instead, use a safer form of
variable declaration to ensure quotes don't foil us in pkgdesc or any other
fields.

This fixes FS#10837.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2009-02-08 12:21:49 -06:00
parent ea84819bbb
commit eb1775e485
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/repo-add.sh.in
View File

@ -151,19 +151,22 @@ db_write_entry()
"
# read info from the zipped package
local line
for line in $(bsdtar -xOf "$pkgfile" .PKGINFO | \
grep -v "^#" | sed 's|\(\w*\)\s*=\s*\(.*\)|\1="\2"|'); do
eval "$line"
case "$line" in
group=*) _groups="$_groups$group\n" ;;
depend=*) _depends="$_depends$depend\n" ;;
backup=*) _backups="$_backups$backup\n" ;;
license=*) _licenses="$_licenses$license\n" ;;
replaces=*) _replaces="$_replaces$replaces\n" ;;
provides=*) _provides="$_provides$provides\n" ;;
conflict=*) _conflicts="$_conflicts$conflict\n" ;;
optdepend=*) _optdepends="$_optdepends$optdepend\n" ;;
local line var val
for line in $(bsdtar -xOf "$pkgfile" .PKGINFO |
grep -v '^#' | sed 's|\(\w*\)\s*=\s*\(.*\)|\1 \2|'); do
# bash awesomeness here- var is always one word, val is everything else
var=${line%% *}
val=${line#* }
declare $var="$val"
case "$var" in
group) _groups="$_groups$group\n" ;;
depend) _depends="$_depends$depend\n" ;;
backup) _backups="$_backups$backup\n" ;;
license) _licenses="$_licenses$license\n" ;;
replaces) _replaces="$_replaces$replaces\n" ;;
provides) _provides="$_provides$provides\n" ;;
conflict) _conflicts="$_conflicts$conflict\n" ;;
optdepend) _optdepends="$_optdepends$optdepend\n" ;;
esac
done