X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=asciidoc-pve.in;h=49e54bddf0aef7edcff27c7d830150000519e170;hb=447596fd16c159593439f61e817450bc9aaf5ef2;hp=b8a9fb2e073d03198a63d0a0c6e6568f14bf6cda;hpb=7d48940bf00be72473ffe9dfc4b5a03e3d948445;p=pve-docs.git

diff --git a/asciidoc-pve.in b/asciidoc-pve.in
index b8a9fb2..49e54bd 100644
--- a/asciidoc-pve.in
+++ b/asciidoc-pve.in
@@ -23,13 +23,13 @@ while (<main::DATA>) { $data_str .= $_; }
 
 my $fileinfo = decode_json($data_str);
 
-my $tmpprefix = ".asciidoc-pve-tmp_";
+my $tmpprefix = '.asciidoc-pve-tmp'.$$.'_';
 
 my $adoc_source_dir = "/usr/share/pve-doc-generator";
 
 # inside pve-docs source dir?
-if (-f "attributes.txt" && -f "pve-admin-guide.adoc") {
-    $adoc_source_dir = "."
+if (-f "asciidoc-pve.in" && -f "pve-admin-guide.adoc") {
+    $adoc_source_dir = getcwd();
 }
 
 my $prepared_files = {};
@@ -146,7 +146,10 @@ sub replace_man_xref {
     die "xref: no text for man page link '$blockid'\n" if !$text;
 
     my $section = $fileinfo->{mansection}->{manvolnum}->{$link};
-    die "link target is not a manual page" if !defined($section);
+    if (!defined($section)) {
+	warn "link '$blockid' target '$link' is not a manual page, ignoring\n";
+	return "$text";
+    }
 
 
     if ($man_target eq 'html') {
@@ -268,7 +271,7 @@ sub compile_asciidoc {
 	die "too many arguments...\n";
 
     my $outfilemap = $fileinfo->{outfile}->{$env}->{$infile} ||
-	die "no output file mapping '$infile => $outfile' ($env)";
+	die "no output file mapping for '$infile' ($env)";
 
     if ($man_target eq 'html') {
 	$outfilemap .= '.html';
@@ -276,8 +279,12 @@ sub compile_asciidoc {
 	$outfilemap .= '-plain.html';
     }
 
-    die "wrong output file name '$outfile != $outfilemap' ($env)"
-	if $outfile ne $outfilemap;
+    if (defined($outfile)) {
+	die "wrong output file name '$outfile != $outfilemap' ($env)"
+	    if $outfile ne $outfilemap;
+    } else {
+	$outfile = $outfilemap;
+    }
 
     defined($fileinfo->{titles}->{$env}) ||
 	die "unknown environment '$env'";
@@ -296,7 +303,12 @@ sub compile_asciidoc {
 
     $leveloffset = - $doctype;
 
-    my $date = `date`;
+    my $date;
+    if (defined($ENV{SOURCE_DATE_EPOCH})) {
+	$date = `date -d "\@$ENV{SOURCE_DATE_EPOCH}"`;
+    } else {
+	$date = `date`;
+    }
     chomp $date;
 
     my $attributes = {
@@ -304,6 +316,7 @@ sub compile_asciidoc {
 	leveloffset => $leveloffset,
 	revnumber => $release,
 	revdate => $date,
+	'footer-style' => 'revdate',
     };
 
     my $mansection = $fileinfo->{mansection}->{$env}->{$infile};
@@ -314,7 +327,7 @@ sub compile_asciidoc {
 	$attributes->{manvolnum} = $mansection;
     } elsif ($env eq 'default') {
 	die "$infile: wrong doctype\n" if $doctype != 0;
-	$attributes->{toc} = undef;
+	$attributes->{toc2} = undef;
     }
 
     if (!defined($outfile)) {
@@ -337,7 +350,9 @@ sub compile_asciidoc {
 	# section like footnotes, so we cannot use a2x.
 	# We use xmlto instead.
 
-	my $cmd = ['asciidoc', '-dmanpage', '-bdocbook', '-a', 'docinfo1'];
+	my $cmd = ['asciidoc', '-dmanpage', '-bdocbook',
+		   '-f', "$adoc_source_dir/asciidoc/asciidoc-pve.conf",
+		   '-a', 'docinfo1'];
 
 	foreach my $key (keys %$attributes) {
 	    my $value = $attributes->{$key};
@@ -379,19 +394,16 @@ sub compile_asciidoc {
 	$attributes->{icons} = undef;
 	$attributes->{'data-uri'} = undef;
 
-	my $cmd = ['asciidoc'];
+	my $cmd = ['asciidoc',
+		   '-f', "$adoc_source_dir/asciidoc/asciidoc-pve.conf",
+	    ];
 
 	if (($env eq 'wiki') ||
 	    (($env eq 'manvolnum') && ($man_target eq 'wiki'))) {
 
-	    push @$cmd, '-s';
-
-	    if (-f "./asciidoc/mediawiki.conf") {
-		my $cwd = getcwd();
-		push @$cmd, '-b', "$cwd/asciidoc/mediawiki";
-	    } else {
-		push @$cmd, '-b', "mediawiki";
-	    }
+	    push @$cmd, '-b', "$adoc_source_dir/asciidoc/mediawiki";
+	} else {
+	    push @$cmd, '-b', "$adoc_source_dir/asciidoc/pve-html";
 	}
 
 	foreach my $key (keys %$attributes) {
@@ -453,7 +465,7 @@ sub scan_extjs_file {
     debug("scan-extjs $filename");
 
     while(defined(my $line = <$fh>)) {
-	if ($line =~ m/\s+onlineHelp:\s*[\'\"](.*?)[\'\"]/) {
+	if ($line =~ m/\s+onlineHelp:\s*[\'\"]([^{}\[\]\'\"]+)[\'\"]/) {
 	    my $blockid = $1;
 	    my $link = $fileinfo->{blockid_target}->{default}->{$blockid};
 	    die "undefined blockid '$blockid' ($filename, line $.)\n"
@@ -567,14 +579,14 @@ if ($clicmd eq 'compile-wiki') {
     my $data_str =  to_json($res_data, { pretty => 1,  canonical => 1 });
     chomp $data_str;
 
-    print "var pveOnlineHelpInfo = ${data_str};\n";
+    print "const pveOnlineHelpInfo = ${data_str};\n";
 
 } elsif ($clicmd eq 'chapter-table') {
-    
+
     print '[width="100%",options="header"]' . "\n";
     print "|====\n";
     print "|Title|Link\n";
-    
+
     my $filelist = $fileinfo->{outfile}->{default};
     foreach my $sourcefile (sort keys %$filelist) {
 	my $target = $filelist->{$sourcefile};
@@ -583,16 +595,16 @@ if ($clicmd eq 'compile-wiki') {
 	    die "not title for '$sourcefile'";
 	print "|$title|link:$target\[\]\n";
     }
-    
+
     print "|====\n";
 
 } elsif ($clicmd =~ m/^man([158])page-table$/) {
-    
+
     my $section = $1;
     print '[width="100%",cols="5*d",options="header"]' . "\n";
     print "|====\n";
     print "|Name 3+|Title|Link\n";
-    
+
     my $filelist = $fileinfo->{outfile}->{manvolnum};
     foreach my $manpage (sort keys %$filelist) {
 	next if $section ne $fileinfo->{mansection}->{manvolnum}->{$manpage};
@@ -606,8 +618,8 @@ if ($clicmd eq 'compile-wiki') {
 	
 	my $target = $filelist->{$manpage};
 	print "|$mantitle 3+|$title|link:$target.html\[$target\]\n";
-    }  
-    
+    }
+
     print "|====\n";
 
 } else {