This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: PATCH: maintainer-scripts/gcc_release
On Sun, 14 Mar 2004, Joseph S. Myers wrote:
>> -# 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
> When running remotely (e.g. for releases), ~ftp must be expanded on
> gcc.gnu.org - not on the system running the script.
>
> When running with -l (as for snapshots), FTP_PATH is already set without
> the quotes in the handling of the -l option.
Ouch; had this been documented, I would have saved quite some time. :-(
(The main goal of that patch was to get rid of three instances where
~ftp/pub/gcc was hardcoded. That definitely was a problem.)
How about the patch below to avoid this tricky situation altogether?
Gerald
Index: gcc_release
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/gcc_release,v
retrieving revision 1.48
diff -u -3 -p -r1.48 gcc_release
--- gcc_release 14 Mar 2004 22:38:57 -0000 1.48
+++ gcc_release 14 Mar 2004 23:01:24 -0000
@@ -440,9 +440,8 @@ 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 (must not use quotes
-# or ~ftp syntax will break).
-FTP_PATH=~ftp/pub/gcc
+# The directory in which the files will be placed.
+FTP_PATH=/var/ftp
# The directory in which snapshots will be placed.
SNAPSHOTS_DIR=${FTP_PATH}/snapshots
@@ -539,7 +538,6 @@ while getopts "d:fr:u:t:p:s:l" ARG; do
;;
l) LOCAL=1
SCP=cp
- FTP_PATH=~ftp/pub/gcc
PATH=~:/usr/local/bin:$PATH;;
p) OLD_TARS="${OLD_TARS} ${OPTARG}"
if [ -d ${OPTARG} ]; then