Skip to content

Commit dee7883

Browse files
committed
fix(perl): Fix perl flag, to actually call perl correctly as well as cleanup shebang
Signed-off-by: dark0dave <dark0dave@mykolab.com>
1 parent 447cfc8 commit dee7883

6 files changed

Lines changed: 14 additions & 4 deletions

File tree

-12.6 KB
Binary file not shown.

stratagems/sfo/general/lib_general.tpa

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ DEFINE_ACTION_FUNCTION ~compile_ssl_to_bcs_core~ INT_VAR skip_bcs=0 STR_VAR scri
5757
REPLACE_TEXTUALLY "\" "/"
5858
END
5959
AT_NOW ~chmod 755 %MOD_FOLDER%/%ssl_loc%/ssl.pl~
60-
AT_NOW ~/usr/bin/perl %MOD_FOLDER%/%ssl_loc%/ssl.pl %scsargs% "%sslvariables%" -o %workspace%/ssl_out -l %ssllibrary% %workspace%/autolib %booleanstring%~ EXACT
60+
LAF check_ini INT_VAR silent=1 STR_VAR ini=Use_Perl_Natively RET perl_natively=value END
61+
ACTION_IF perl_natively BEGIN
62+
AT_NOW ~perl %MOD_FOLDER%/%ssl_loc%/ssl.pl %scsargs% "%sslvariables%" -o %workspace%/ssl_out -l %ssllibrary% %workspace%/autolib %booleanstring%~ EXACT
63+
END ELSE BEGIN
64+
AT_NOW ~/usr/bin/perl %MOD_FOLDER%/%ssl_loc%/ssl.pl %scsargs% "%sslvariables%" -o %workspace%/ssl_out -l %ssllibrary% %workspace%/autolib %booleanstring%~ EXACT
65+
END
6166
END ELSE BEGIN
6267
LAF check_ini STR_VAR ini=Use_Perl_Natively RET value END
6368
ACTION_IF value BEGIN

stratagems/sfo2e/lib_ssl.tph

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,12 @@ BEGIN
9595
REPLACE_TEXTUALLY EXACT_MATCH "\" "/"
9696
END
9797
AT_NOW ~chmod 755 %ssl_loc%/ssl.pl~
98-
AT_NOW ~/usr/bin/perl %ssl_loc%/ssl.pl %scsargs% "%sslvariables%" -o %workspace%/ssl_out -l %ssllibrary% %data_loc%/autolib %booleanstring%~ EXACT
98+
LAF check_ini INT_VAR silent=1 STR_VAR ini=Use_Perl_Natively RET perl_natively=value END
99+
ACTION_IF perl_natively BEGIN
100+
AT_NOW ~perl %ssl_loc%/ssl.pl %scsargs% "%sslvariables%" -o %workspace%/ssl_out -l %ssllibrary% %data_loc%/autolib %booleanstring%~ EXACT
101+
END ELSE BEGIN
102+
AT_NOW ~/usr/bin/perl %ssl_loc%/ssl.pl %scsargs% "%sslvariables%" -o %workspace%/ssl_out -l %ssllibrary% %data_loc%/autolib %booleanstring%~ EXACT
103+
END
99104
END
100105
END
101106
END

stratagems/ssl/ssl.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22

33
my $scsline="";
44
# my $defaultlibraryfile="scsii/ssl/library.slb";

stratagems/stratagems.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Disable_SSL = 0
176176
God_Does_Not_Play_Dice=0
177177
force_tra_rebuild=0
178178
debug_variable=0
179-
use_perl_natively=0
179+
use_perl_natively=1
180180
Scroll_Drop_Fraction = 10
181181
assume_unmodified_iwd_scripts = 1
182182
poison_stat=162

testfile.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)