X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=asciidoc-pve.in;h=83f59ebb383cd4558ab0bebcb32e4b2811c62d6e;hb=8985eb37ba5f2c6ceb330e62f5a8aab744b9db19;hp=92b0ca2f4192ea43a7b28c87d4c8d61916449f43;hpb=dc7c3dd9e3b8712641b1381ac138c7ae70ba72e7;p=pve-docs.git

diff --git a/asciidoc-pve.in b/asciidoc-pve.in
index 92b0ca2..83f59eb 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 = {};
@@ -341,7 +341,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};
@@ -383,19 +385,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) {