[elpa] master cd7cd92: Make update-archive.sh less brittle

[Nicolas Petton]

branch: master
commit cd7cd9294c6513a29eaed95e28f36a0c31416c85
Author: Nicolas Petton <address@hidden>
Commit: Nicolas Petton <address@hidden>

    Make update-archive.sh less brittle
    
    * admin/update-archive.sh: Do not fail if there is no staging-old
    directory, and use $buildir instead of hardcoding "build" in some
    places.
---
 admin/update-archive.sh |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/admin/update-archive.sh b/admin/update-archive.sh
index 464a007..7b03d7d 100755
--- a/admin/update-archive.sh
+++ b/admin/update-archive.sh
@@ -96,9 +96,10 @@ latest="emacs-packages-latest.tgz"
 (cd ../
  mkdir -p staging/packages
  # Not sure why we have `staging-old', but let's keep it for now.
+ mkdir -p 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
+ for f in $buildir/archive/packages/*; do
      # PKG-VER
      pv=$(basename "$f")
      dst="staging/packages/$pv"
@@ -118,10 +119,10 @@ latest="emacs-packages-latest.tgz"
              fi ;;
      esac
  done
- mv build/archive/"$latest" staging/
- rm -rf build/archive)
+ mv $buildir/archive/"$latest" staging/
+ rm -rf $buildid/archive)
 
 # Make the HTML and readme.txt files.
 (cd ../staging/packages
- emacs --batch -l ../../build/admin/archive-contents.el \
+ emacs --batch -l $buildir/admin/archive-contents.el \
        --eval '(batch-html-make-index)')