gcc_release (SNAPSHOTS_DIR): New variable.

	* gcc_release (SNAPSHOTS_DIR): New variable.  Use it.
	(announce_snapshot): Use it.

From-SVN: r79484

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index ba125775517d1300b585c332eff8d7ea1fb4a815..2646c80a4d965d37d199f99c595d0876cfa3e84c 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-14  Gerald Pfeifer  <gerald@pfeifer.com>
+
+       * gcc_release (SNAPSHOTS_DIR): New variable.  Use it.
+       (announce_snapshot): Use it.
+
 2004-03-14  Gerald Pfeifer  <gerald@pfeifer.com>
 
        * gcc_release (announce_snapshot): Use changedir instead of

diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index a9718ae71b97c419bb1d94d1af9563f806158c1b..0b6340f18a7a0a1dee0771f08896cd65fab54371 100755 (executable)
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -392,7 +392,7 @@ announce_snapshot() {
   inform "Updating links and READMEs on the FTP server"
   
   TEXT_DATE=`date --date=$DATE +%B\ %d,\ %Y`
-  changedir ~ftp/pub/gcc/snapshots
+  changedir "${SNAPSHOTS_DIR}"
   sed -e "s%@DATE@%$DATE%g" \
     -e "s%@TEXT_DATE@%$TEXT_DATE%g" \
     -e "s%@LAST_DATE@%$LAST_DATE%g" \
@@ -416,7 +416,7 @@ announce_snapshot() {
   inform "Sending mail"
 
   export QMAILHOST=gcc.gnu.org
-  mail -s "gcc-ss-${RELEASE} is now available" gcc@gcc.gnu.org < ~ftp/pub/gcc/snapshots/${RELEASE}/README
+  mail -s "gcc-ss-${RELEASE} is now available" gcc@gcc.gnu.org < ${SNAPSHOTS_DIR}/${RELEASE}/README
 }
 
 ########################################################################
@@ -440,8 +440,11 @@ CVS_USERNAME="${USER}"
 GCC_HOSTNAME="gcc.gnu.org"
 # The name of the account on the machine to which files are uploaded.
 GCC_USERNAME="gccadmin"
-# The directory in which the files will be placed.
-FTP_PATH="~ftp/pub/gcc"
+# The directory in which the files will be placed (must not use quotes
+# or ~ftp syntax will break).
+FTP_PATH=~ftp/pub/gcc
+# The directory in which snapshots will be placed.
+SNAPSHOTS_DIR=${FTP_PATH}/snapshots
 
 # The major number for the release.  For release `3.0.2' this would be 
 # `3'
@@ -618,8 +621,7 @@ else
   # was.
   if [ $MODE_DIFFS -ne 0 ] && [ $LOCAL -ne 0 ]; then
     LAST_DATE=`cat ~/.snapshot_date-${BRANCH}`
-    LAST_DIR=~ftp/pub/gcc/snapshots/${BRANCH}-${LAST_DATE}
-    OLD_TARS=${LAST_DIR}/gcc-${BRANCH}-${LAST_DATE}.tar.bz2
+    OLD_TARS=${SNAPSHOTS_DIR}/${BRANCH}-${LAST_DATE}/gcc-${BRANCH}-${LAST_DATE}.tar.bz2
   fi
 fi