diff --git a/src/Utils/cdrom/1-gen-layout-map.pl b/src/Utils/cdrom/1-gen-layout-map.pl index a656bcd5..59859fc0 100755 --- a/src/Utils/cdrom/1-gen-layout-map.pl +++ b/src/Utils/cdrom/1-gen-layout-map.pl @@ -1,11 +1,18 @@ #!/usr/bin/perl -$tgzdir = "/stage/fgfs03/curt/Scenery/Scenery-0.9.5"; +$tgzdir = "/stage/fgfs07/ftp/pub/fgfs/Scenery-1.0.0/"; $verbose = 0; -if ( $#ARGV < 0 ) { - die "usage: $0 (DVD=4500, CDROM=700)\n"; +if ( $#ARGV != 1 ) { + print "usage: $0 \n"; + print " - where is some amount to reserve on the first disk\n"; + print " for things like the win32 setup program or aircraft or src.\n"; + print " At the moment 700 (Mb) works well.\n"; + print " - and is the size in MB of each individual disk.\n"; + print " DVD=4500 (Mb), CDROM=700 (Mb)\n"; + exit; } else { + $reserve = shift(@ARGV); $disksize = shift(@ARGV); } @@ -25,13 +32,13 @@ if ( $#ARGV < 0 ) { for $lon (@lons) { for $lat (@lats) { - push( @files, "$lon$lat.tar.gz" ); + push( @files, "$lon$lat.tgz" ); } } $disk = 1; -$total_disk = 0; +$total_disk = $reserve; $total_collection = 0; foreach $file ( @files ) { diff --git a/src/Utils/cdrom/2-make-layout-link-tree.pl b/src/Utils/cdrom/2-make-layout-link-tree.pl index 80cf7c81..0d5ffa1d 100755 --- a/src/Utils/cdrom/2-make-layout-link-tree.pl +++ b/src/Utils/cdrom/2-make-layout-link-tree.pl @@ -1,12 +1,12 @@ #!/usr/bin/perl -$source = "/stage/fgfs03/curt/Scenery/Scenery-0.9.5"; +$source = "/stage/fgfs07/ftp/pub/fgfs/Scenery-1.0.0"; $layout_master = shift( @ARGV ); $dest = shift( @ARGV ); if ( $layout_master eq "" ) { - $layout_master = "./layout-disks-0.9.5"; + $layout_master = "./layout-dvd-1.0.0"; } if ( $dest eq "" ) { $dest = "./Images"; @@ -43,5 +43,6 @@ foreach $file ( @layout ) { system( "mkdir -p $dest/$dir" ); } - system( "ln -sf $source/$base $dest/$file\n" ); + printf( "ln -sf $source/$base $dest/$file\n" ); + system( "ln -sf $source/$base $dest/$file" ); } diff --git a/src/Utils/cdrom/3-make-dvd-image b/src/Utils/cdrom/3-make-dvd-image index 183ce745..1e192e65 100755 --- a/src/Utils/cdrom/3-make-dvd-image +++ b/src/Utils/cdrom/3-make-dvd-image @@ -8,7 +8,7 @@ if [ "x${2}" == "x" ]; then exit fi -VERSION=0.9.5 +VERSION=1.0.0 SOURCE=$1 DEST=$2 VOLUME_ID=FG_Scenery_${SOURCE}_v${VERSION} diff --git a/src/Utils/cdrom/sum-new-sizes.pl b/src/Utils/cdrom/sum-new-sizes.pl index 9e50eb9f..d42f11f8 100755 --- a/src/Utils/cdrom/sum-new-sizes.pl +++ b/src/Utils/cdrom/sum-new-sizes.pl @@ -8,7 +8,7 @@ if ( $#ARGV < 0 ) { $cdromdir = shift(@ARGV); } -@files = `ls $cdromdir/*.tar.gz`; +@files = `ls $cdromdir/*.tgz`; $total = 0; foreach $file ( @files ) {