From b3b4281aff18f35e1bc8fc6a639ea1949c1e392c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 12 Sep 2023 20:15:36 +0000 Subject: pdfjam (12sep23) git-svn-id: svn://tug.org/texlive/trunk@68257 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/pdfjam/pdfjam | 4 ++-- Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf | Bin 13840 -> 13840 bytes Master/texmf-dist/doc/support/pdfjam/VERSION | 2 +- Master/texmf-dist/doc/support/pdfjam/tests.zip | Bin 148380 -> 148378 bytes Master/texmf-dist/scripts/pdfjam/pdfjam | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/pdfjam/pdfjam b/Build/source/texk/texlive/linked_scripts/pdfjam/pdfjam index 455d2cbeca1..cd6ea75cbe3 100755 --- a/Build/source/texk/texlive/linked_scripts/pdfjam/pdfjam +++ b/Build/source/texk/texlive/linked_scripts/pdfjam/pdfjam @@ -1,5 +1,5 @@ #!/bin/sh -version=3.07 +version=3.08 ######################################################################### ## ## ## pdfjam: A shell-script interface to the "pdfpages" LaTeX package ## @@ -943,7 +943,7 @@ fi ## A function to check if using non-Cygwin "${latex}" from Cygwin using_non_cygwin_latex_from_cygwin () { if [ -z "${__cache__using_non_cygwin_latex_from_cygwin}" ]; then - if [ "$(uname -o)" = "Cygwin" ] \ + if uname | grep -q CYGWIN \ && "${latex}" -version | head -1 | grep -qv Cygwin; then __cache__using_non_cygwin_latex_from_cygwin=0 else diff --git a/Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf b/Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf index 22c26624358..63da1925209 100644 Binary files a/Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf and b/Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf differ diff --git a/Master/texmf-dist/doc/support/pdfjam/VERSION b/Master/texmf-dist/doc/support/pdfjam/VERSION index 1de2ea467fb..824e1853a49 100644 --- a/Master/texmf-dist/doc/support/pdfjam/VERSION +++ b/Master/texmf-dist/doc/support/pdfjam/VERSION @@ -1 +1 @@ -This is pdfjam 3.07 \ No newline at end of file +This is pdfjam 3.08 \ No newline at end of file diff --git a/Master/texmf-dist/doc/support/pdfjam/tests.zip b/Master/texmf-dist/doc/support/pdfjam/tests.zip index 958fdf322b3..719c14b8ddb 100644 Binary files a/Master/texmf-dist/doc/support/pdfjam/tests.zip and b/Master/texmf-dist/doc/support/pdfjam/tests.zip differ diff --git a/Master/texmf-dist/scripts/pdfjam/pdfjam b/Master/texmf-dist/scripts/pdfjam/pdfjam index 455d2cbeca1..cd6ea75cbe3 100755 --- a/Master/texmf-dist/scripts/pdfjam/pdfjam +++ b/Master/texmf-dist/scripts/pdfjam/pdfjam @@ -1,5 +1,5 @@ #!/bin/sh -version=3.07 +version=3.08 ######################################################################### ## ## ## pdfjam: A shell-script interface to the "pdfpages" LaTeX package ## @@ -943,7 +943,7 @@ fi ## A function to check if using non-Cygwin "${latex}" from Cygwin using_non_cygwin_latex_from_cygwin () { if [ -z "${__cache__using_non_cygwin_latex_from_cygwin}" ]; then - if [ "$(uname -o)" = "Cygwin" ] \ + if uname | grep -q CYGWIN \ && "${latex}" -version | head -1 | grep -qv Cygwin; then __cache__using_non_cygwin_latex_from_cygwin=0 else -- cgit v1.2.3