* admin/package-update.sh: Disable org-mode fetch by default. Add

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

diff --git a/admin/package-update.sh b/admin/package-update.sh
index db99b27942689cc8f630288076d2aa64bc067267..38708b7024d1ddae278fabc1b63ebeabbcfbdc4e 100755 (executable)
--- a/admin/package-update.sh
+++ b/admin/package-update.sh
@@ -1,6 +1,9 @@
 #/bin/sh
 
+PATH=/bin:/usr/bin:/usr/local/bin
 ROOT=$1
+FETCHEXTRAS=$2
+
 LOG=$ROOT/update-log
 PKGROOT=$ROOT/packages
 ADMINROOT=$ROOT/admin
@@ -12,8 +15,10 @@ REPO=bzr://bzr.savannah.gnu.org/emacs/elpa
 REPO_PACKAGES=$REPO/packages
 REPO_ADMIN=$REPO/admin
 
+PACKAGE_TARBALLS="auctex-11.86 company-0.5 muse-3.20"
+
 if [ -z $ROOT ]; then
-    echo "Syntax: $0 HOMEDIR"
+    echo "Syntax: $0 HOMEDIR [fetch-extras-boolean]"
     exit 1
 elif [ -d $ROOT ]; then
     echo "Installing into '$ROOT', log is '$LOG'"
@@ -28,24 +33,39 @@ fi
 echo "[$TMPROOT -> $PKGROOT] Creating the world-facing package repository copy in $PKGROOT" >> $LOG
 TMPROOT=$PKGROOT-new
 rm -rf $TMPROOT
-/usr/bin/bzr export $TMPROOT $REPO_PACKAGES
+bzr export $TMPROOT $REPO_PACKAGES
 
 echo "[$TMPROOT -> $PKGROOT] Running the post-export fetchers in $ADMINROOT against $TMPROOT" >> $LOG
 rm -rf $ADMINROOT
 bzr export $ADMINROOT $REPO_ADMIN
 
-# Copy the org daily package from orgmode.org
-echo "[$TMPROOT -> $PKGROOT] Running the post-export org-mode fetcher as '$ADMINROOT/org-synch.sh $TMPROOT $ADMINROOT'" >> $LOG
-$ADMINROOT/org-synch.sh $TMPROOT $ADMINROOT >> $LOG 2>&1
+if [ -z $FETCHEXTRAS ]; then
+    echo "Skipping the post-export fetchers" >> $LOG
+    echo "(pass 1 as the second parameter to get them with $0 or just run them manually)" >> $LOG
+else
+    # Copy the org daily package from orgmode.org
+    echo "[$TMPROOT -> $PKGROOT] Running the post-export org-mode fetcher as '$ADMINROOT/org-synch.sh $TMPROOT $ADMINROOT'" >> $LOG
+    $ADMINROOT/org-synch.sh $TMPROOT $ADMINROOT >> $LOG 2>&1
+fi
+
+echo "Creating tarballs from unpacked packages $PACKAGE_TARBALLS in $TMPROOT" >> $LOG
+cd $TMPROOT
+for pt in $PACKAGE_TARBALLS; do
+    echo "Creating tarball of $pt: tar of $TMPROOT/$pt into $TMPROOT/$pt.tar" >> $LOG
+    tar -cf $pt.tar $pt
+    echo "Removing $TMPROOT/$pt" >> $LOG
+    rm -rf $pt
+done
+cd ..
 
 echo "[$TMPROOT -> $PKGROOT] Moving $TMPROOT to $PKGROOT" >> $LOG
-/bin/mv $PKGROOT $PKGROOT-old
-/bin/mv $TMPROOT $PKGROOT
-/bin/rm -rf $PKGROOT-old
+mv $PKGROOT $PKGROOT-old
+mv $TMPROOT $PKGROOT
+rm -rf $PKGROOT-old
 
 echo "Exporting packages into $TARBALL (root = $TARBALL_ROOT)" >> $LOG
-/usr/bin/bzr export --format=tgz --root=$TARBALL_ROOT $TARBALL $REPO_PACKAGES
+bzr export --format=tgz --root=$TARBALL_ROOT $TARBALL $REPO_PACKAGES
 
-/bin/chmod -R a+rX $PKGROOT
+chmod -R a+rX $PKGROOT
 
 echo "Update complete at" `/bin/date` >> $LOG