summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-30 22:40:03 +0000
committerKarl Berry <karl@freefriends.org>2011-05-30 22:40:03 +0000
commit98089aa15f7c449ac60349d745f1aa0d666e4324 (patch)
tree46be7b5777d0a94643d67e9941153d2230376753 /Master
parent55e84860a68077a32a86ba8781ad77456239abe3 (diff)
use $tmpdir consistently, find . for bsd (from
nikola l). git-svn-id: svn://tug.org/texlive/trunk@22693 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-bindir29
1 files changed, 14 insertions, 15 deletions
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index eb1bc9bcc3c..ab2e70a222a 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -8,6 +8,7 @@ unset LS_COLORS
tmpdir=${TMPDIR-/tmp}/tlupbin.$$
trap "rm -rf $tmpdir" 0 1 2 15
+test -d $tmpdir || mkdir -p $tmpdir
usage="$0 [OPTION]... TL-PLATFORM...
@@ -92,7 +93,7 @@ for tlname in $tlnames; do
# karl update convenience
default_bin_loc=
- download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.gz
+ download_loc=$tmpdir/tl.$tlname.tar.gz
grab="$download -O $download_loc"
if test x"$USER" = xkarl; then
case $tlname in
@@ -100,12 +101,12 @@ for tlname in $tlnames; do
default_bin_loc=$download_loc
$grab http://www.logic.at/people/preining/alpha-linux.tar.gz;;
amd64-freebsd)
- download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://anthesphoria.net/FreeBSD/TeXLive-Devel/amd64-freebsd7.tar.xz;;
amd64-kfreebsd)
- download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab ftp://ftp.cea.fr/incoming/y2k01/tlbuild/x86_64-unknown-kfreebsd8.2-gnu.tar.xz;;
@@ -116,19 +117,19 @@ for tlname in $tlnames; do
default_bin_loc=$download_loc
$grab http://www.math.cornell.edu/~kbrown/cygwin.tgz;;
i386-freebsd)
- download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://anthesphoria.net/FreeBSD/TeXLive-Devel/i386-freebsd7.tar.xz;;
i386-kfreebsd)
- download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab ftp://ftp.cea.fr/incoming/y2k01/tlbuild/i686-unknown-kfreebsd8.2-gnu.tar.xz;;
i386-linux)
default_bin_loc=/home/texlive/sarge/tmp/source/inst/bin/i686-pc-linux-gnu;;
i386-netbsd)
- download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://salmi.ch/~jukka/TL/TL2010bin_i386-netbsd.tar.xz;;
@@ -136,7 +137,7 @@ for tlname in $tlnames; do
default_bin_loc=$download_loc
$grab http://students.dec.bmth.ac.uk/ebarrett/files/tl-bin-20080810.tgz;;
i386-solaris)
- download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://ocean1.ee.duth.gr/~apostolo/i386-pc-solaris2.11.tar.xz;;
@@ -145,15 +146,15 @@ for tlname in $tlnames; do
sparc-linux)
default_bin_loc=/home/karl/s.tgz;;
universal-darwin)
- download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://www.uoregon.edu/~koch/universal-darwin.tar.xz;;
win32)
- default_bin_loc=${TMPDIR-$tmpdir}/tl.$tlname.zip
+ default_bin_loc=$tmpdir/tl.$tlname.zip
$grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;;
x86_64-darwin)
- download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab www.uoregon.edu/~koch/x86_64-darwin.tar.xz;;
@@ -161,7 +162,7 @@ for tlname in $tlnames; do
default_bin_loc=$download_loc
$grab ftp://ftpth.mppmu.mpg.de/pub/peb/TLtests/Build-x86_64-linux.tar.bz2;;
x86_64-solaris)
- download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+ download_loc=$tmpdir/tl.$tlname.tar.xz
default_bin_loc=$download_loc
grab="$download -O $download_loc"
$grab http://ocean1.ee.duth.gr/~apostolo/x86_64-pc-solaris2.11.tar.xz;;
@@ -177,8 +178,6 @@ for tlname in $tlnames; do
fi
$msg "installing from $bin_loc to $destdir via $tmpdir"
- rm -rf $tmpdir
- mkdir $tmpdir
# if we were given a tar file, unpack it.
if test -f "$bin_loc"; then
@@ -215,8 +214,8 @@ for tlname in $tlnames; do
comm -13 $tmpdir/now $tmpdir/new >$ouradd # looking for additions
# get symlink list.
- (cd $destdir && find -type l | sort) >$tmpdir/now.symlink
- (cd $srcdir && find -type l | sort) >$tmpdir/new.symlink
+ (cd $destdir && find . -type l | sort) >$tmpdir/now.symlink
+ (cd $srcdir && find . -type l | sort) >$tmpdir/new.symlink
cd $destdir || exit 1