From ea4f5e9a11843907b28c929524a38b280dca6657 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Sun, 22 Sep 2002 23:33:42 +0000
Subject: rpm2lsm in the reight place.

svn path=/trunk/; revision=3733
---
 upload | 59 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

(limited to 'upload')

diff --git a/upload b/upload
index 372a27c1..46d487a7 100755
--- a/upload
+++ b/upload
@@ -37,39 +37,38 @@ scp history.html $dest
 echo "Upload to ${WWWVIRTUAL} complete"
 
 echo "Beginning FTP upload..."
-lftp <<EOF
-# Copy to FTP site
-open $FTPHOST
-cd $FTPDIR/fetchmail
-put fetchmail-${version}.tar.gz
-put fetchmail-${version}-1.i386.rpm
-put fetchmail-${version}-1.src.rpm
-close
-echo "FTP upload complete."
-
-# Next, upload to Metalab
-echo "Beginning Metalab upload..."
 rpm2lsm -k ${keywords} *.rpm >fetchmail.lsm
-open -u anonymous,esr@thyrsus.com metalab.unc.edu
-cd incoming/Linux 
-put fetchmail-${version}.tar.gz
-put fetchmail.lsm
-put README -o fetchmail.README 
-put fetchmail-FAQ.html
-put fetchmail-${version}-1.i386.rpm
-put fetchmail-${version}-1.src.rpm
-close
-echo "Upload to Metalab complete"
+lftp <<EOF
+  # Copy to FTP site
+  open $FTPHOST
+  cd $FTPDIR/fetchmail
+  put fetchmail-${version}.tar.gz
+  put fetchmail-${version}-1.i386.rpm
+  put fetchmail-${version}-1.src.rpm
+  close
+  echo "FTP upload complete."
 
-# Finally, upload the RPMS to Red Hat
-echo "Beginning Red Hat upload"
-open incoming.redhat.com
-cd libc6
-put fetchmail-${version}-1.i386.rpm
-put fetchmail-${version}-1.src.rpm
-close
-echo "Upload to Red Hat contrib complete"
+  # Next, upload to Metalab
+  echo "Beginning Metalab upload..."
+  open -u anonymous,esr@thyrsus.com metalab.unc.edu
+  cd incoming/Linux 
+  put fetchmail-${version}.tar.gz
+  put fetchmail.lsm
+  put README -o fetchmail.README 
+  put fetchmail-FAQ.html
+  put fetchmail-${version}-1.i386.rpm
+  put fetchmail-${version}-1.src.rpm
+  close
+  echo "Upload to Metalab complete"
 
+  # Finally, upload the RPMS to Red Hat
+  echo "Beginning Red Hat upload"
+  open incoming.redhat.com
+  cd libc6
+  put fetchmail-${version}-1.i386.rpm
+  put fetchmail-${version}-1.src.rpm
+  close
+  echo "Upload to Red Hat contrib complete"
 EOF
     echo "fetchmail uploaded"
 fi
-- 
cgit v1.2.3