From 995856a19b691c107b806b8103828f9a01ce32b1 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 22 May 2014 10:39:23 -0400 Subject: [PATCH] * update-archive.sh (announce_new): Avoid "eval" and don't assume pkg names don't start with -. --- admin/update-archive.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/update-archive.sh b/admin/update-archive.sh index 680298b38..de4a0a4de 100755 --- a/admin/update-archive.sh +++ b/admin/update-archive.sh @@ -50,8 +50,9 @@ signal_error () { announce_new () { if [ "yes" != "$announce" ]; then return; fi pv="$1" - eval $(echo "$pv" | sed -e 's/^\(.*\)-\([^-]*\)$/pkg="\1" ver="\2"/') - test "$pkg" && test "$ver" || signal_error "bad PKG-VER: $pv" + pkg="$(echo "$pv" | sed -e 's/^\(.*\)-\([^-]*\)\.[^-.]*$/\1/')" + ver="$(echo "$pv" | sed -e 's/^\(.*\)-\([^-]*\)\.[^-.]*$/\2/')" + if [ -z "$pkg" ] || [ -z "$ver" ]; then signal_error "bad PKG-VER: $pv"; fi send_mail "$a_email" "[GNU ELPA] $pkg version $ver" <