Skip to content

Commit 9ea48d2

Browse files
committed
perl_{exe,version}: more robust
1 parent 548917b commit 9ea48d2

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

+stdlib/perl_exe.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
if s == 0 && isfile(r)
1818
exe = r;
1919
perle = r;
20+
else
21+
exe = string.empty;
2022
end
2123

2224
end

+stdlib/perl_version.m

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515
return
1616
end
1717

18-
cmd = sprintf('"%s" -e "print $^V"', stdlib.perl_exe());
18+
v = [];
1919

20-
[s, r] = system(cmd);
20+
exe = stdlib.perl_exe();
2121

22-
if s == 0
23-
v = sscanf(r, 'v%d.%d.%d').';
24-
else
25-
v = [];
22+
if ~stdlib.strempty(exe)
23+
cmd = sprintf('"%s" -e "print $^V"', exe);
24+
25+
[s, r] = system(cmd);
26+
27+
if s == 0
28+
v = sscanf(r, 'v%d.%d.%d').';
29+
end
2630
end
2731

2832
% cache the result - even if empty -- because the check takes up to 1000 ms say on HPC

0 commit comments

Comments
 (0)