* update-archive.sh (announce_new): Avoid "eval" and don't assume pkg names

[gnu-emacs-elpa] / admin / update-archive.sh

diff --git a/admin/update-archive.sh b/admin/update-archive.sh
index 1b5f2375f0d2b858e28e299adfea13f08a7e541b..de4a0a4ded6ae18ac7921d950c5b65089755bb7d 100755 (executable)
--- a/admin/update-archive.sh
+++ b/admin/update-archive.sh
@@ -49,11 +49,12 @@ signal_error () {
 
 announce_new () {
     if [ "yes" != "$announce" ]; then return; fi
-    file="$1"
-    version="$(echo "$file" | sed -e 's|^.*/||' -e 's/^\(.*\)-\([^-]*\)\.[^-.]*$/\2/')"
-    pkg="$(echo "$file" | sed -e 's|^.*/||' -e 's/^\(.*\)-\([^-]*\)\.[^-.]*$/\1/')"
-    send_mail "$a_email" "[GNU ELPA] $pkg version $version" <<ENDDOC
-Version $version of GNU ELPA package $pkg has just been released.
+    pv="$1"
+    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" <<ENDDOC
+Version $ver of GNU ELPA package $pkg has just been released.
 You can now find it in M-x package-list RET.
 
 More at http://elpa.gnu.org/packages/$pkg.html
@@ -105,7 +106,9 @@ latest="emacs-packages-latest.tgz"
  cp -a staging staging-old
  # Move new files into place but don't throw out old package versions.
  for f in build/archive/packages/*; do
-     dst="staging/packages/$(basename "$f")"
+     # PKG-VER
+     pv=$(basename "$f")
+     dst="staging/packages/$pv"
      # Actually, let's never overwrite an existing version.  So changes can
      # be installed without causing a new package to be built until the
      # version field is changed.  Some files need to be excluded from the
@@ -117,7 +120,8 @@ latest="emacs-packages-latest.tgz"
              then rm "$f"
              else
                  mv "$f" "$dst"
-                 announce_new "$f"
+                 # FIXME: Add a tag to remember the precise code used.
+                 announce_new "$pv"
              fi ;;
      esac
  done