diff options
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlogsieve/texlogsieve | 22 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/texlogsieve.1 | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/texlogsieve.man1.pdf | bin | 41838 -> 41842 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/texlogsieve/texlogsieve.pdf | bin | 60077 -> 60124 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/texlogsieve/texlogsieve.tex | 5 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/texlogsieve/texlogsieve | 22 |
6 files changed, 34 insertions, 17 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlogsieve/texlogsieve b/Build/source/texk/texlive/linked_scripts/texlogsieve/texlogsieve index 331651fd55f..8130b189d33 100755 --- a/Build/source/texk/texlive/linked_scripts/texlogsieve/texlogsieve +++ b/Build/source/texk/texlive/linked_scripts/texlogsieve/texlogsieve @@ -972,7 +972,7 @@ Options: --version print program version]] versionmsg = [[ -texlogsieve 1.3.0 +texlogsieve 1.3.1 Copyright (C) 2021, 2022 Nelson Lago <lago@ime.usp.br> License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>. This is free software: you are free to change and redistribute it. @@ -1037,21 +1037,29 @@ function processCommandLine(args) -- Add the default config file to the beginning of the list local filename = kpse.find_file('texlogsieverc') if filename ~= nil then table.insert(configFileNames, 1, filename) end + filename = nil if os.type == "unix" then - filename = kpse.find_file(os.getenv("HOME") .. "/.texlogsieverc") + local dirname = os.getenv("HOME") -- should never be nil, but... + if dirname then + filename = kpse.find_file(dirname .. "/.texlogsieverc") + end else -- https://docs.microsoft.com/en-us/windows/deployment/usmt/usmt-recognized-environment-variables -- %LOCALAPPDATA% corresponds to C:\Users\<username>\AppData\Local . - filename = kpse.find_file(os.getenv("%LOCALAPPDATA%") .. "/texlogsieverc") - if filename == nil then - -- %APPDATA% is "C:\Users\<username>\AppData\Roaming" or - -- "C:\Documents and Settings\<username>\Application Data" - filename = kpse.find_file(os.getenv("%APPDATA%") .. "/texlogsieverc") + -- %APPDATA% is "C:\Users\<username>\AppData\Roaming" or + -- "C:\Documents and Settings\<username>\Application Data" + for _, envdir in ipairs({"LOCALAPPDATA", "APPDATA"}) do + local dirname = os.getenv(envdir) + if dirname then + filename = kpse.find_file(dirname .. "/texlogsieverc") + if filename then break end + end end end if filename ~= nil then table.insert(configFileNames, 1, filename) end + filename = nil for _, filename in ipairs(configFileNames) do local configFile = assert(io.open(filename, "r")) diff --git a/Master/texmf-dist/doc/man/man1/texlogsieve.1 b/Master/texmf-dist/doc/man/man1/texlogsieve.1 index b39e33eff2f..8aff5ee630e 100644 --- a/Master/texmf-dist/doc/man/man1/texlogsieve.1 +++ b/Master/texmf-dist/doc/man/man1/texlogsieve.1 @@ -1,4 +1,4 @@ -.TH TEXLOGSIEVE "1" "August 2022" "texlogsieve 1.3.0" "User Commands" +.TH TEXLOGSIEVE "1" "September 2022" "texlogsieve 1.3.1" "User Commands" .SH NAME diff --git a/Master/texmf-dist/doc/man/man1/texlogsieve.man1.pdf b/Master/texmf-dist/doc/man/man1/texlogsieve.man1.pdf Binary files differindex 099832b51db..b72b83987c6 100644 --- a/Master/texmf-dist/doc/man/man1/texlogsieve.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/texlogsieve.man1.pdf diff --git a/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.pdf b/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.pdf Binary files differindex 1891667c3d6..4bfffed9c3e 100644 --- a/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.pdf +++ b/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.pdf diff --git a/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.tex b/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.tex index 40323ceb2ac..d44af80df99 100644 --- a/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.tex +++ b/Master/texmf-dist/doc/support/texlogsieve/texlogsieve.tex @@ -92,12 +92,13 @@ \changes{1.3.0}{2022/08/05}{Add line number to parse error messages} \changes{1.3.0}{2022/08/05}{Add \texttt{-\/-verbose} option} \changes{1.3.0}{2022/08/05}{Search for a config file in the user's homedir too} +\changes{1.3.1}{2022/09/05}{Fix bug when searching for config files in Windows} \begin{document} \title{\textsf{texlogsieve}:\thanks{This document -corresponds to \textsf{texlogsieve}~1.3.0, -dated~2022-08-05.}\\[.3\baselineskip] +corresponds to \textsf{texlogsieve}~1.3.1, +dated~2022-09-05.}\\[.3\baselineskip] {\normalsize(yet another program to)\\[-.6\baselineskip]} {\large filter and summarize \LaTeX\ log files} } diff --git a/Master/texmf-dist/scripts/texlogsieve/texlogsieve b/Master/texmf-dist/scripts/texlogsieve/texlogsieve index 331651fd55f..8130b189d33 100755 --- a/Master/texmf-dist/scripts/texlogsieve/texlogsieve +++ b/Master/texmf-dist/scripts/texlogsieve/texlogsieve @@ -972,7 +972,7 @@ Options: --version print program version]] versionmsg = [[ -texlogsieve 1.3.0 +texlogsieve 1.3.1 Copyright (C) 2021, 2022 Nelson Lago <lago@ime.usp.br> License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>. This is free software: you are free to change and redistribute it. @@ -1037,21 +1037,29 @@ function processCommandLine(args) -- Add the default config file to the beginning of the list local filename = kpse.find_file('texlogsieverc') if filename ~= nil then table.insert(configFileNames, 1, filename) end + filename = nil if os.type == "unix" then - filename = kpse.find_file(os.getenv("HOME") .. "/.texlogsieverc") + local dirname = os.getenv("HOME") -- should never be nil, but... + if dirname then + filename = kpse.find_file(dirname .. "/.texlogsieverc") + end else -- https://docs.microsoft.com/en-us/windows/deployment/usmt/usmt-recognized-environment-variables -- %LOCALAPPDATA% corresponds to C:\Users\<username>\AppData\Local . - filename = kpse.find_file(os.getenv("%LOCALAPPDATA%") .. "/texlogsieverc") - if filename == nil then - -- %APPDATA% is "C:\Users\<username>\AppData\Roaming" or - -- "C:\Documents and Settings\<username>\Application Data" - filename = kpse.find_file(os.getenv("%APPDATA%") .. "/texlogsieverc") + -- %APPDATA% is "C:\Users\<username>\AppData\Roaming" or + -- "C:\Documents and Settings\<username>\Application Data" + for _, envdir in ipairs({"LOCALAPPDATA", "APPDATA"}) do + local dirname = os.getenv(envdir) + if dirname then + filename = kpse.find_file(dirname .. "/texlogsieverc") + if filename then break end + end end end if filename ~= nil then table.insert(configFileNames, 1, filename) end + filename = nil for _, filename in ipairs(configFileNames) do local configFile = assert(io.open(filename, "r")) |