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:
>> -FTP_PATH=~ftp/pub/gcc
>> +# The directory in which the files will be placed.
>> +FTP_PATH=/var/ftp
> I don't really like this sort of hardcoding (if the lookup of the home
> directory can be done at runtime, it surely is better to do it at runtime,
> even though any move of the directory would probably be accompanied by
> appropriate symlinks to support scripts with an old location hardcoded).
Now, I can tell fragile code when I see it, and using ~ftp, sometimes
evaluating it locally, sometimes via scp expansion, really is way too
fragile (and lead me astray, for example). Besides, I do not agree
that ~ftp is more generic than /var/ftp.
> (Besides, /var/ftp is not the same as ~ftp/pub/gcc.)
Well spotted. I have committed the patch below now, after testing it
by generating a snapshot off the 3.3 branch on gcc.gnu.org.
Gerald
2004-03-25 Gerald Pfeifer <gerald@pfeifer.com>
* gcc_release (FTP_PATH): Use /var/ftp instead of ~ftp, and
only set at a single place.
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 25 Mar 2004 10:49:57 -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 (do not use ~user syntax).
+FTP_PATH=/var/ftp/pub/gcc
# 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