summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/.mkisofsrc3
-rwxr-xr-xMaster/tlpkg/bin/tl-update-images29
2 files changed, 16 insertions, 16 deletions
diff --git a/Master/.mkisofsrc b/Master/.mkisofsrc
index 704197e5e26..f3d838f360f 100644
--- a/Master/.mkisofsrc
+++ b/Master/.mkisofsrc
@@ -1,5 +1,4 @@
APPI=Complete TeX system
COPY=LICENSE.TL
-PREP=TeX Live <tex-live@tug.org>
-PUBL=TeX Users Group <office@tug.org>
+PUBL=TeX Live <tex-live@tug.org>
VOLI=TeXLive2010
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index faf50af1854..a305fdc0665 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -34,18 +34,19 @@ cd $mydir || exit 1 # the Master/tlpkg/bin directory
master=`cd ../.. && /bin/pwd`
test -z "$master" && exit 1
-XZ_OPT=-1; export XZ_OPT # compression level, -9 for slowest-but-most
-
NAME=texlive
V=2010
D=`date +%Y%m%d`
+target=/home/karl/texlive/Images/test
+
+XZ_OPT=-1; export XZ_OPT # compression level, -9 for slowest-but-most,
+ # which is not worth the time.
debug=${OVERRIDE_DEBUG-false}
-target=/home/ftp/texlive/Images/test
-quiet= # for passing to mkisofs
makeinst=true
maketar=true
-mkisofs=mkisofs
+mkisofs=mkisofs # "xorriso -as mkisofs"
+quiet= # for passing to mkisofs
while test $# -gt 0; do
case $1 in
@@ -71,17 +72,14 @@ mkdir -p $target
# From the days when we made multiple images. Keep it factored out in
# case they come back.
-common_mkisofs_options=" $quiet -pad -J -dir-mode 0755 -r \
- -copyright $master/LICENSE.TL \
- -x .svn \
-"
+common_mkisofs_options="$quiet -pad -J -dir-mode 0755 -r -x .svn"
#
MAKEINST ()
{
prefix=$target/$NAME$V # directory and prefix for our files within
iso=$prefix-$D.iso
- echo "-- `date` Writing image to $iso."
+ echo "-- `date` Writing image to $iso"
# remove old images and checksums.
rm -f $prefix-*.iso* $prefix-*.md5 $prefix-*.sha256
@@ -92,9 +90,10 @@ MAKEINST ()
rm -rf $imgdir
mkdir $imgdir
- # files from master. intentionally skip dirs.
- cp -p $master/* $imgdir 2>/dev/null || true
- cp -pr $master/readme* $master/source $imgdir
+ # files and just a couple small dirs from master.
+ cp -p $master/.mkisofsrc $imgdir # mkisofs control
+ cp -p $master/* $imgdir 2>/dev/null || true # intentionally skip dirs
+ cp -pr $master/readme* $master/source $imgdir # do these few dirs
# files from tlnet.
cd /home/ftp/texlive/tlnet
@@ -102,7 +101,9 @@ MAKEINST ()
cd $imgdir || exit 1
rm doc.html tlpkg/texlive.tlpdb.xz
- mkisofs $common_mkisofs_options -o $iso .
+ cmd="$mkisofs $common_mkisofs_options -o $iso ."
+ echo "-- `date` with: $cmd"
+ $cmd
rm -rf $imgdir