[pacman-dev] [PATCH 1/9] repo-add: bashify reading of .PKGINFO file
Dave Reisner
d at falconindy.com
Wed Jun 22 20:38:45 EDT 2011
grep and sed aren't needed here, and this removes the truly ugly
manipulation of IFS. The process substituion could just as well be a
herestring, but it breaks vim's syntax highlighting. Style over
substance, mang.
Signed-off-by: Dave Reisner <d at falconindy.com>
---
scripts/repo-add.sh.in | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 4e2e4a7..01eeb84 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -19,6 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+shopt -s extglob
+
# gettext initialization
export TEXTDOMAIN='pacman'
export TEXTDOMAINDIR='@localedir@'
@@ -226,19 +228,12 @@ db_write_entry() {
_groups _licenses _replaces _depends _conflicts _provides _optdepends \
md5sum sha256sum pgpsig
- local OLDIFS="$IFS"
- # IFS (field separator) is only the newline character
- IFS="
-"
-
# read info from the zipped package
local line var val
- for line in $(bsdtar -xOqf "$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"
+ while read -r line; do
+ [[ ${line:0:1} = '#' ]] && continue
+ IFS=' =' read -r var val < <(printf '%s\n' "$line")
+ declare "$var=${val//+([[:space:]])/ }" # normalize whitespace
case "$var" in
group) _groups="$_groups$group\n" ;;
license) _licenses="$_licenses$license\n" ;;
@@ -248,9 +243,7 @@ db_write_entry() {
provides) _provides="$_provides$provides\n" ;;
optdepend) _optdepends="$_optdepends$optdepend\n" ;;
esac
- done
-
- IFS=$OLDIFS
+ done< <(bsdtar -xOqf "$pkgfile" .PKGINFO)
csize=$(@SIZECMD@ "$pkgfile")
--
1.7.5.4
More information about the pacman-dev
mailing list