projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rlm_perl hook for prepaid voip radius, RT#4100
[freeside.git]
/
bin
/
masonize
diff --git
a/bin/masonize
b/bin/masonize
index
def0115
..
509ef3e
100755
(executable)
--- a/
bin/masonize
+++ b/
bin/masonize
@@
-1,38
+1,43
@@
#!/usr/bin/perl
#!/usr/bin/perl
-foreach $file ( split(/\n/, `find . -depth -print | grep cgi\$`) ) {
+foreach $file ( split(/\n/, `find . -depth -print`) ) {
+ next unless $file =~ /(cgi|html)$/;
open(F,$file) or die "can't open $file for reading: $!";
@file = <F>;
#print "$file ". scalar(@file). "\n";
close $file;
open(F,$file) or die "can't open $file for reading: $!";
@file = <F>;
#print "$file ". scalar(@file). "\n";
close $file;
- system("chmod u+w $file");
- open(W,">$file") or die "can't open $file for writing: $!";
- select W; $| = 1; select STDOUT;
$newline = ''; #avoid prepending extraneous newlines
$all = join('',@file);
$newline = ''; #avoid prepending extraneous newlines
$all = join('',@file);
+ $w = '';
+
$mode = 'html';
while ( length($all) ) {
if ( $mode eq 'html' ) {
if ( $all =~ /^(.+?)(<%=?.*)$/s && $1 !~ /<%/s ) {
$mode = 'html';
while ( length($all) ) {
if ( $mode eq 'html' ) {
if ( $all =~ /^(.+?)(<%=?.*)$/s && $1 !~ /<%/s ) {
-
print W
$1;
+
$w .=
$1;
$all = $2;
next;
} elsif ( $all =~ /^<%=(.*)$/s ) {
$all = $2;
next;
} elsif ( $all =~ /^<%=(.*)$/s ) {
-
print W
'<%';
+
$w .=
'<%';
$all = $1;
$mode = 'perlv';
#die;
next;
} elsif ( $all =~ /^<%(.*)$/s ) {
$all = $1;
$mode = 'perlv';
#die;
next;
} elsif ( $all =~ /^<%(.*)$/s ) {
-
print W
$newline; $newline = "\n";
+
$w .=
$newline; $newline = "\n";
$all = $1;
$mode = 'perlc';
$all = $1;
$mode = 'perlc';
+
+ #avoid newline prepend fix from borking indented first <%
+ $w =~ s/\n\s+\z/\n/;
+ $w .= "\n" if $w =~ /.+\z/;
+
next;
} elsif ( $all !~ /<%/s ) {
next;
} elsif ( $all !~ /<%/s ) {
-
print W
$all;
+
$w .=
$all;
last;
} else {
warn length($all); die;
last;
} else {
warn length($all); die;
@@
-42,23
+47,23
@@
foreach $file ( split(/\n/, `find . -depth -print | grep cgi\$`) ) {
} elsif ( $mode eq 'perlv' ) {
if ( $all =~ /^(.*?%>)(.*)$/s ) {
} elsif ( $mode eq 'perlv' ) {
if ( $all =~ /^(.*?%>)(.*)$/s ) {
-
print W
$1;
+
$w .=
$1;
$all=$2;
$mode = 'html';
next;
}
$all=$2;
$mode = 'html';
next;
}
- die
'unterminated <%= ???'
;
+ die
"unterminated <%= ??? (in $file):"
;
} elsif ( $mode eq 'perlc' ) {
if ( $all =~ /^([^\n]*?)%>(.*)$/s ) {
} elsif ( $mode eq 'perlc' ) {
if ( $all =~ /^([^\n]*?)%>(.*)$/s ) {
-
print W
"%$1\n";
+
$w .=
"%$1\n";
$all=$2;
$mode='html';
next;
}
if ( $all =~ /^([^\n]*)\n(.*)$/s ) {
$all=$2;
$mode='html';
next;
}
if ( $all =~ /^([^\n]*)\n(.*)$/s ) {
-
print W
"%$1\n";
+
$w .=
"%$1\n";
$all=$2;
next;
}
$all=$2;
next;
}
@@
-67,5
+72,9
@@
foreach $file ( split(/\n/, `find . -depth -print | grep cgi\$`) ) {
}
}
+ system("chmod u+w $file");
+ select W; $| = 1; select STDOUT;
+ open(W,">$file") or die "can't open $file for writing: $!";
+ print W $w;
close W;
}
close W;
}