diff options
| author | Dan McGee <dan@archlinux.org> | 2009-02-18 21:20:17 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-02-18 21:20:17 -0600 |
| commit | 1c4633ea2cbc01cfd7929509724951615827c482 (patch) | |
| tree | 5a0f505caca856b6772e83e8234659334a5851c7 | |
| parent | 6c4d702cb10f9bc5da23b6511f09f4b4a07a4281 (diff) | |
| parent | e7daa59f845f073511c632a972215d047f292f25 (diff) | |
| download | pacman-1c4633ea2cbc01cfd7929509724951615827c482.tar.xz | |
Merge branch 'maint'
| -rw-r--r-- | doc/PKGBUILD.5.txt | 10 | ||||
| -rw-r--r-- | po/pl.po | 2 | ||||
| -rw-r--r-- | scripts/repo-add.sh.in | 29 |
3 files changed, 22 insertions, 19 deletions
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 04eacfac..f8ed7f26 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') @@ -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" diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 6b10527d..b4ae7d35 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -141,19 +141,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 |