From eb1775e485f7320142a3c66332166ff5ab1f0401 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 8 Feb 2009 12:21:49 -0600 Subject: 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 --- scripts/repo-add.sh.in | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index be0859ea..32e3a301 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -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 -- cgit v1.2.3-54-g00ecf From 48b209d6121f24e990951daf0edf1345012b4c78 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 17 Feb 2009 16:58:33 -0600 Subject: Rework optdepends documentation for clarity Signed-off-by: Dan McGee --- doc/PKGBUILD.5.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 416f55e1..c1ad4df8 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -140,11 +140,11 @@ name. The syntax is: `$$source=('filename::url')$$` depends. *optdepends (array)*:: - An array of optional packages (and accompanying reasons) that are not - essential to the package, but would offer increased functionality or other - features when installed. optdepends are currently for informational - purposes only and are not utilized by pacman during dependency resolution. - The format should be similar to the following: + An array of packages (and accompanying reasons) that are not essential for + base functionality, but may be necessary to make full use of the contents + of this package. optdepends are currently for informational purposes only + and are not utilized by pacman during dependency resolution. The format + should be similar to the following: optdepends=('fakeroot: for makepkg usage as normal user') -- cgit v1.2.3-54-g00ecf From e7daa59f845f073511c632a972215d047f292f25 Mon Sep 17 00:00:00 2001 From: Jan Stępień Date: Wed, 18 Feb 2009 20:23:14 +0100 Subject: A tiny fix in the Polish translation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous translation of 'targets' meant literally 'it targets' and it sounded awkwardly. The current version is a plural of a 'target'. Signed-off-by: Jan Stępień Signed-off-by: Dan McGee --- po/pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/pl.po b/po/pl.po index eaafb3be..cf027acf 100644 --- a/po/pl.po +++ b/po/pl.po @@ -900,7 +900,7 @@ msgstr "Żadnych" #, c-format msgid "Targets (%d):" -msgstr "Celuje (%d):" +msgstr "Cele (%d):" #, c-format msgid "Total Download Size: %.2f MB\n" -- cgit v1.2.3-54-g00ecf