diff options
Diffstat (limited to 'Master/tlpkg/bin')
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-images | 71 |
1 files changed, 39 insertions, 32 deletions
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images index 56331ec8a82..e29d7bf6189 100755 --- a/Master/tlpkg/bin/tl-update-images +++ b/Master/tlpkg/bin/tl-update-images @@ -71,9 +71,10 @@ common_mkisofs_options="$quiet -pad -J -dir-mode 0755 -r -x .svn" # MAKEINST () { + origdir=`pwd` prefix=$target/$NAME$V # directory and prefix for our files within iso=$prefix-$D.iso - echo "-- `date` Writing image to $iso" + echo; echo "-- `date` writing image to $iso" # remove old images and checksums. rm -f $prefix-*.iso* $prefix-*.md5 $prefix-*.sha256 $prefix-*.sha512 @@ -95,8 +96,8 @@ MAKEINST () index.html */*.html */*.pdf */*.png \ | (cd $imgdir/texlive-doc && tar xf -)) - # files from tlnet. - cd /home/ftp/texlive/tlpretest + # files from network dist. + cd /home/ftp/texlive/tlpretest || exit 1 if $debug; then echo "source = `pwd`" fi @@ -106,8 +107,8 @@ MAKEINST () # do this here so that they can be kept in the tree, # and thus installed normally over the net. # keep in sync with info on http://tug.org/texlive/doc.html. - prune="alpha-linux armel-linux armhf-linux mipsel-linux powerpc-linux" - echo "-- pruning platforms $prune..." + prune="armel-linux armhf-linux powerpc-linux" + echo "-- pruning platforms: $prune..." mkdir $imgdir/tlpkg/bin cp $mydir/tl-prune-platforms $imgdir/tlpkg/bin $imgdir/tlpkg/bin/tl-prune-platforms $prune >/tmp/imgprune @@ -126,31 +127,30 @@ MAKEINST () fi chmod a+rw $iso + cd $target || exit 1 rm -rf $imgdir # make checksums - # and symlinks with short names (potentially used in /etc/fstab). - for ext in ""; do # used to do .xz here too - rm -f $prefix.iso$ext $prefix.iso$ext.md5 $prefix.iso$ext.sha256 $prefix.iso$ext.sha512 - - (cd $target && md5sum `basename $iso$ext`) >$iso$ext.md5 - (cd $target && sha512sum `basename $iso$ext`) >$iso$ext.sha512 - (cd $target && rm -f $iso$ext.sha512.asc) - (cd $target && $master/tlpkg/bin/tl-sign-file $iso$ext.sha512) + rm -f $prefix.iso.md5; md5sum `basename $iso` >$iso.md5 + rm -f $prefix.iso.sha512; sha512sum `basename $iso` >$iso.sha512 - ln -s `basename $iso$ext` $prefix.iso$ext - - # for md5 and sha512, have to adjust the filename embedded in the file. - sed s,-$D,, $iso$ext.md5 >$prefix.iso$ext.md5 - sed s,-$D,, $iso$ext.sha512 >$prefix.iso$ext.sha512 - #ln -s `basename $iso`$ext.md5 $prefix.iso$ext.md5 - #ln -s `basename $iso`$ext.sha256 $prefix.iso$ext.sha256 + # for md5 and sha512, have to adjust the embedded filename for generic files. + rm -f $prefix.iso.md5; sed "s,-$D,," $iso.md5 >$prefix.iso.md5 + rm -f $prefix.iso.sha512; sed "s,-$D,," $iso.sha512 >$prefix.iso.sha512 - rm -f $prefix.iso$ext.sha512.asc - $master/tlpkg/bin/tl-sign-file $prefix.iso$ext.sha512 - - ls -l $iso$ext - done + # signed versioned and generic files. + rm -f $iso.sha512.asc + $master/tlpkg/bin/tl-sign-file $iso.sha512 + # + rm -f $prefix.iso.sha512.asc + $master/tlpkg/bin/tl-sign-file $prefix.iso.sha512 + + # symlink with short name (potentially used in /etc/fstab). + ln -s `basename $iso` $prefix.iso + + cd $origdir || exit 1 + echo "-- `date` iso files:" + ls -l $iso $iso.sha512 $iso.sha512.asc } @@ -175,7 +175,7 @@ do_tar () compress=--xz # excludes=--exclude-vcs - for e in bibtex epstopdf jfontmaps; do # "upstream" sources + for e in bibtex epstopdf jfontmaps; do # exclude "upstream" sources excludes="$excludes --exclude=extra/$e" done # @@ -188,17 +188,24 @@ do_tar () if test $? -ne 0; then echo "$0: tar failed, goodbye." >&2 fi - (cd $target && sha512sum `basename $tarfile`) >$tarfile.sha512 - (cd $target && rm -f $tarfile.sha512.asc) - (cd $target && $master/tlpkg/bin/tl-sign-file $tarfile.sha512) + + origdir=`pwd` + cd $target || exit 1 + # + rm -f $tarfile.sha512 + sha512sum `basename $tarfile` >$tarfile.sha512 + # + rm -f $tarfile.sha512.asc + $master/tlpkg/bin/tl-sign-file $tarfile.sha512 + # + cd $origdir || exit 1 - ls -l $tarfile + ls -l $tarfile $tarfile.sha512 $tarfile.sha512.asc } MAKETAR () { - echo - echo "-- `date` Writing tars to $target" + echo; echo "-- `date` writing tars to $target" # remove old tarballs and checksums. rm -f $target/$NAME-*.tar.* |