From e55f0ed4f13e7e2ad30fd925464378c499006513 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Fri, 6 Jan 2012 13:48:04 +0100 Subject: [PATCH] =?utf8?q?Sachen=20die=20ans=20System=20=C3=BCbergeben=20w?= =?utf8?q?erden=20richtig=20Quoten.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit hat als Seiteneffekt, dass Latex Tests String::ShellQuote brauchen. --- SL/InstallationCheck.pm | 4 ++++ scripts/installation_check.pl | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm index 70d6217db..e8670761c 100644 --- a/SL/InstallationCheck.pm +++ b/SL/InstallationCheck.pm @@ -71,6 +71,10 @@ sub template_dirs { sub classes_from_latex { my ($path, $class) = @_; + eval { use String::ShellQuote; 1 } or warn "can't load String::ShellQuote" && return; + $path = shell_quote $path; + $class = shell_quote $class; + open my $pipe, q#egrep -rs '^[\ \t]*# . "$class' $path". q# | sed 's/ //g' | awk -F '{' '{print $2}' | awk -F '}' '{print $1}' |#; my @cls = <$pipe>; close $pipe; diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl index 3a81c85f8..0f0dc202b 100755 --- a/scripts/installation_check.pl +++ b/scripts/installation_check.pl @@ -95,7 +95,12 @@ sub kpsewhich { $package =~ s/[^-_0-9A-Za-z]//g; my $type_desc = $type eq 'cls' ? 'document class' : 'package'; - my $exit = system(qq|TEXINPUTS=".:$dw:" kpsewhich $package.$type > /dev/null|); + eval { use String::ShellQuote; 1 } or warn "can't load String::ShellQuote" && return; + $dw = shell_quote $dw; + my $e_package = shell_quote $package; + my $e_type = shell_quote $type; + + my $exit = system(qq|TEXINPUTS=".:$dw:" kpsewhich $e_package.$e_type > /dev/null|); my $res = $exit > 0 ? 0 : 1; print_result("Looking for LaTeX $type_desc $package", $res); -- 2.20.1