* update-archive.sh (send_mail): Use `sendmail' and `rsync'.

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

diff --git a/admin/update-archive.sh b/admin/update-archive.sh
index d7d4e931b3a6152c8a1e7c992a2ee7d2dcd315cd..464a0078ceec56f9a571d2afe431bea51656006a 100755 (executable)
--- a/admin/update-archive.sh
+++ b/admin/update-archive.sh
@@ -21,19 +21,13 @@ done
 send_mail () {
     to="$1"; shift
     title="$*"
-    mx_gnu_org="$(host -t mx gnu.org | sed 's/.*[      ]//')"
-    (sleep 5; echo "HELO elpa.gnu.org"
-     sleep 1; echo "MAIL FROM: <elpa@elpa.gnu.org>"
-     sleep 1; echo "RCPT TO: <$to>"
-     sleep 1; echo "DATA"
-     sleep 1; cat <<ENDDOC
+    (cat <<ENDDOC
 From: ELPA update <do.not.reply@elpa.gnu.org>
 To: $to
 Subject: $title
 
 ENDDOC
-         cat -; echo
-         echo "."; sleep 1) | telnet "$mx_gnu_org" smtp
+     cat -) | /usr/sbin/sendmail "$to"
 }
 
 # Send an email to warn about a problem.
@@ -49,11 +43,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
@@ -101,11 +96,12 @@ latest="emacs-packages-latest.tgz"
 (cd ../
  mkdir -p staging/packages
  # Not sure why we have `staging-old', but let's keep it for now.
- rm -rf staging-old
- cp -a staging staging-old
+ rsync -av --inplace --delete 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
@@ -118,7 +114,7 @@ latest="emacs-packages-latest.tgz"
              else
                  mv "$f" "$dst"
                  # FIXME: Add a tag to remember the precise code used.
-                 announce_new "$f"
+                 announce_new "$pv"
              fi ;;
      esac
  done