summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Chernoff <mseven@telus.net>2024-06-24 07:28:40 +0000
committerMax Chernoff <mseven@telus.net>2024-06-24 07:28:40 +0000
commitf136d5c4c486cf021980dd3187c9d2ec079186cc (patch)
tree9b3aca26c4ad0246f962e842d22052caea937a06
parent4d4ea9655a04cbf4d43d0c1247fd47f07dc5a6c7 (diff)
Fix the tlpkg/ctan updater scripts to support multiple users on one system
git-svn-id: svn://tug.org/texlive/trunk@71611 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/c2a2
-rwxr-xr-xMaster/tlpkg/bin/c2l8
-rwxr-xr-xMaster/tlpkg/bin/c2lx12
-rwxr-xr-xMaster/tlpkg/bin/ctan2tl2
4 files changed, 12 insertions, 12 deletions
diff --git a/Master/tlpkg/bin/c2a b/Master/tlpkg/bin/c2a
index 1c6eb16221c..3d1b942f4b1 100755
--- a/Master/tlpkg/bin/c2a
+++ b/Master/tlpkg/bin/c2a
@@ -106,7 +106,7 @@ sub do_place {
#
sub run_c2l {
my ($arg) = @_;
- my $tmpfile = "/tmp/c2l$arg.out";
+ my $tmpfile = "/tmp/@{[getlogin()]}-c2l$arg.out";
# don't bother with svn update unless we are doing place.
if ($arg eq "p") {
diff --git a/Master/tlpkg/bin/c2l b/Master/tlpkg/bin/c2l
index 41eba37d1b6..2f7891be9a7 100755
--- a/Master/tlpkg/bin/c2l
+++ b/Master/tlpkg/bin/c2l
@@ -119,11 +119,11 @@ sub main {
print "$0: running ctan2tl @ARGV\n";
# we want our exit status to be from ctan2tl, not tee, hence the
# pipefail bash-ism.
- my @lines = `set -o pipefail; ctan2tl @ARGV </dev/null 2>&1 | tee /tmp/cl.out`;
+ my @lines = `set -o pipefail; ctan2tl @ARGV </dev/null 2>&1 | tee /tmp/@{[getlogin()]}-cl.out`;
my $status = $?;
my $cooked = "$TLROOT/Build/tmp.cooked";
- -d $cooked && system ("cp /tmp/cl.out $cooked/$ARGV[$#ARGV].out");
+ -d $cooked && system ("cp /tmp/@{[getlogin()]}-cl.out $cooked/$ARGV[$#ARGV].out");
# *** and other notable messages.
my @msgs = grep { /^\*\*\*.* \S/
@@ -146,10 +146,10 @@ sub main {
my @page = split (/\f */, $whole_string, 4);
my $diff_list
- = `test -s /tmp/$<.tlplace.diff && sed -n -e 's/^--- //' \\
+ = `test -s /tmp/@{[getlogin()]}-$<.tlplace.diff && sed -n -e 's/^--- //' \\
-e 's/[ \\t].*//' \\
-e 's,/home/texlive/karl/, ,p' \\
- /tmp/$<.tlplace.diff`;
+ /tmp/@{[getlogin()]}-$<.tlplace.diff`;
$diff_list = "";
# page 0: build stuff.
diff --git a/Master/tlpkg/bin/c2lx b/Master/tlpkg/bin/c2lx
index 7bb7403a523..7554b43107d 100755
--- a/Master/tlpkg/bin/c2lx
+++ b/Master/tlpkg/bin/c2lx
@@ -13,9 +13,9 @@
#
# Additional argument "p" runs place also (same as c2l --place).
-dirsfile=/tmp/`id -u`.tlplace.dirs
+dirsfile=/tmp/@{[getlogin()]}-`id -u`.tlplace.dirs
cp /dev/null $dirsfile.tmp
-cp /dev/null /tmp/first
+cp /dev/null /tmp/@{[getlogin()]}-first
if test "x$1" = xe || test "x$1" = x2e; then
shift; label=l2e
@@ -65,13 +65,13 @@ echo "`basename $0`: $label pkgs: $pkgs"
for p in $pkgs; do
echo "${label} pkg $p" >&2 # progress report of a sort
printf "\f ${label} pkg $p\n"
- c2l "$@" $p | tee /tmp/c2l.out
- sed -n "1,/`printf '\f'`/p" /tmp/c2l.out >>/tmp/first
- echo >>/tmp/first
+ c2l "$@" $p | tee /tmp/@{[getlogin()]}-c2l.out
+ sed -n "1,/`printf '\f'`/p" /tmp/@{[getlogin()]}-c2l.out >>/tmp/@{[getlogin()]}-first
+ echo >>/tmp/@{[getlogin()]}-first
cat $dirsfile >>$dirsfile.tmp
done
sort -u $dirsfile.tmp >$dirsfile
wc $dirsfile
echo
-cat /tmp/first
+cat /tmp/@{[getlogin()]}-first
diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl
index 6fa11dab89b..df4cd55530c 100755
--- a/Master/tlpkg/bin/ctan2tl
+++ b/Master/tlpkg/bin/ctan2tl
@@ -189,7 +189,7 @@ find $pkg -type l -ls | grep -v /Master/bin | sort >&2
# show list of files (and tee to tmp).
find $pkg \! -type d -printf "%TY%Tm%Td.%TH%TM %p\n" | sort -k2 \
-| tee ${TMPDIR-/tmp}/ctan2tl.files
+| tee ${TMPDIR-/tmp}/"$USER"-ctan2tl.files
printf "\n$0: calling place $place_chicken $contrib_place_arg $pkg\n"
rm -rf $pkg.done