From f19eeb23cec257a4c2b97f7b2ffc44e4fad99945 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 25 Feb 2021 16:50:26 +0000 Subject: c2b for branch updates git-svn-id: svn://tug.org/texlive/trunk@57907 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/c2b | 8 ++++++++ Master/tlpkg/bin/c2l | 16 +++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100755 Master/tlpkg/bin/c2b (limited to 'Master/tlpkg/bin') diff --git a/Master/tlpkg/bin/c2b b/Master/tlpkg/bin/c2b new file mode 100755 index 00000000000..90e9e24c085 --- /dev/null +++ b/Master/tlpkg/bin/c2b @@ -0,0 +1,8 @@ +#!/bin/sh +# $Id$ +# Public domain. Originally written by Karl Berry, 2021. +# c2b - run c2l but inside /home/texlive/branch. + +PATH=`echo $PATH | sed -e s,karl/Master,branch/Master,g` +cd $HOME || exit 1 # just in case . is a trunk bin directory +exec c2l "$@" diff --git a/Master/tlpkg/bin/c2l b/Master/tlpkg/bin/c2l index c7356d53695..e239adaa5bd 100755 --- a/Master/tlpkg/bin/c2l +++ b/Master/tlpkg/bin/c2l @@ -5,13 +5,19 @@ # Convenience front-end script to run ctan2tl. It rearranges the output # so error messages come first, then the list of changed files. Also # accepts platform abbreviations to run tl-update-bindir, etc. Don't -# take it too seriously; it surely need generalizing for use by anyone -# else. Uses various personal environment variables, etc. +# take it too seriously; it surely needs generalizing. + +use Cwd; +use File::Basename; $| = 1; exit (&main ()); sub main { + my $real0 = Cwd::abs_path ($0); + my $scriptdir = File::Basename::dirname ($real0); # .../Master/tlpkg/bin + my $TLROOT = Cwd::abs_path ("$scriptdir/../../.."); # ... + # platform abbrev my $arg = $ARGV[0]; if ($arg eq "asy") { @@ -79,7 +85,7 @@ sub main { exit 0; } - if (-d "$ENV{xb}/$arg") { + if (-d "$TLROOT/Master/bin/$arg") { print ("tl-update-bindir $arg\n"); exec ("tl-update-bindir", $arg); } @@ -92,8 +98,8 @@ sub main { my @lines = `set -o pipefail; ctan2tl @ARGV &1 | tee /tmp/cl.out`; my $status = $?; - -d "$ENV{B}/tmp.cooked" - && system ("cp /tmp/cl.out $ENV{B}/tmp.cooked/$ARGV[$#ARGV].out"); + my $cooked = "$TLROOT/Build/tmp.cooked"; + -d $cooked && system ("cp /tmp/cl.out $cooked/$ARGV[$#ARGV].out"); # *** and other notable messages. my @msgs = grep { /^\*\*\*.* \S/ -- cgit v1.2.3