[MinGW-cvs] xscripts ChangeLog, 1.14, 1.15 x86-mingw32-build.sh, 1.10, 1.11

Update of /cvsroot/mingw/xscripts
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9717

Modified Files:
	ChangeLog x86-mingw32-build.sh 
Log Message:
Defend against apparent success of failed SourceForge download.


Index: x86-mingw32-build.sh
===================================================================
RCS file: /cvsroot/mingw/xscripts/x86-mingw32-build.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** x86-mingw32-build.sh	14 Mar 2009 22:24:27 -0000	1.10
--- x86-mingw32-build.sh	15 Mar 2009 23:28:22 -0000	1.11
***************
*** 61,65 ****
    then
      echo downloading ...
!     $RUN wget $DOWNLOAD_HOST/$FILE || die $? "$script: download failed"
    else
      die 2 "missing ...
--- 61,85 ----
    then
      echo downloading ...
!     #
!     # This kludgy download hack is required to defend against bizarre
!     # behaviour of SourceForge's mirror selection mechanism, which allows
!     # `wget' to apparently succeed, when it should fail; when this occurs,
!     # it actually downloads complete garbage, with an odd and unexpected
!     # name, bearing no resemblance to the file requested.
!     #
!     ( manifest=`echo *`
!       $RUN wget $DOWNLOAD_HOST/$FILE && \
!       { test -f $FILE || \
! 	{ for file in `echo *`
! 	  do
! 	    for keep in $FILE $manifest
! 	    do
! 	      test "x$file" = "x$keep" && { file="."; break; }
! 	    done
! 	    test "x$file" = "x." || rm "./$file"
! 	  done; false
! 	}
!       }
!     ) || die $? "$script: $FILE: download failed"
    else
      die 2 "missing ...

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/xscripts/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ChangeLog	15 Mar 2009 13:05:54 -0000	1.14
--- ChangeLog	15 Mar 2009 23:28:22 -0000	1.15
***************
*** 1,4 ****
--- 1,12 ----
  2009-03-15  Keith Marshall  <kei...@us...>
  
+ 	Defend against apparent success of failed SourceForge download.
+ 
+ 	* x86-mingw32-build.sh (manifest, keep): New shell local variables;
+ 	use them to track package directory content, detect false download,
+ 	and remove phantom dowload files.
+ 
+ 2009-03-15  Keith Marshall  <kei...@us...>
+ 
  	Prepare version 1.0, release candidate #1.