[Freeciv-Dev] Re: (PR#4131) 'make dist' for the daily snapshot

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

Jason Short wrote:
> Paul Zastoupil wrote:
> 
>>Also, please don't remove the freeciv directory that is checked out in
>>user freeciv's home directory.  The website depends on this for a few
>>things (Like the PEOPLE file).
> 
> 
> Is that done now?
> 
> I think the problem is because I use wildcards, since the version of the 
> tarball (currently 1.14.1-devel) is not hard-coded.  The line
> 
>    "mv freeciv-* freeciv-cvs-$TODAY"
> 
> doesn't work because freeciv-* matches multiple files.  This is because 
> the directory is not kept tidy.
> 
> So, in this patch I remove the spurious freeciv-* files.  Can you test this?

Slight change: the "cd .." line needs to be moved down.

jason

Index: mklatest
===================================================================
RCS file: /home/freeciv/CVS/admin_bin/mklatest,v
retrieving revision 1.45
diff -u -r1.45 mklatest
--- mklatest    2003/07/23 17:23:47     1.45
+++ mklatest    2003/07/24 19:20:29
@@ -189,18 +189,20 @@
 # 'autogen.sh' must be run first.
 log "Building distribution tarball."
 cd freeciv
+rm -r freeciv-*
 ./autogen.sh >/dev/null || error "Autogen run failed."
 make dist >/dev/null 2>&1 || error "Make dist failed."
-cd ..
 
 # Rename the freeciv-<version> directory as freeciv-cvs-$TODAY.  Since
 # the 'make dist' generates a tarball we must first unpack this, then
 # rename, then repack (into a .tar.bz2).
 FREECIV=freeciv-cvs-$TODAY
 tar zxf freeciv/freeciv-*.tar.gz
-#rm -rf freeciv
+rm freeciv-*.tar.gz
 mv freeciv-*/ $FREECIV/
 tar -cf - $FREECIV | bzip2 -9 > $LATESTSNAP/$FREECIV.tar.bz2
+rm -r $FREECIV
+cd ..
 
 [ ! -s $LATESTSNAP/$FREECIV.tar.bz2 ] && \
   error "Could not make $LATESTSNAP/$FREECIV.tar.bz2."