CDN Preparation - small fixes found during testing

diff --git a/Makefile b/Makefile
index 688ea6e51913da820fa07b14f039a826ea462489..9ab13983386214359dbaac4983c1deaaba0ff596 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -375,7 +375,6 @@ general-policies: $(GENERAL_POLICIES) policies/general/dirdata.yaml \
        done
 policies/general/index.inc: general-policies general-policy-supplemental bin/mk-md-titlelist Makefile
        ./bin/mk-md-titlelist '' $(GENERAL_POLICIES) > $@
-policies/general/index.md: policies/general/index.inc
 policies/general/dirdata.yaml: policies/general/index.inc
 policies/general/index.html: policies/general/index.md
 

diff --git a/bin/md-to-html5 b/bin/md-to-html5
index 3cabbe26b88920291202fe6e42f327bbb6064372..e7b40b7e07014dcd27f208463f7fd89056159fab 100755 (executable)
--- a/bin/md-to-html5
+++ b/bin/md-to-html5
@@ -130,14 +130,14 @@ fi
 
 for f in "$@"; do
     if [ "$f" != "-" ]; then
-       base=$(basename_custom "$f" .md)
+       base=$(basename_custom "$f" md)
        dir=$(dirname "$f")
 
        if [ "$f" = "$base" ]; then
            continue;
        fi
     else
-       base=$(basename_custom "$output" .html)
+       base=$(basename_custom "$output" html)
        dir=$(dirname "$output")
     fi
 

diff --git a/bin/mk-apropos b/bin/mk-apropos
index 3c2c5793fb01a2e9a1a864edadb618997463a4d5..5c888c8dd6a6b9bf1fcaeee24313ad1823905143 100755 (executable)
--- a/bin/mk-apropos
+++ b/bin/mk-apropos
@@ -14,7 +14,7 @@ for m in $(find . -name '*.md.tt' | sort); do
        continue
     fi
     manfile=$(basename_custom $m)
-    manname=$(basename_custom $manfile .md.tt)
+    manname=$(basename_custom $manfile md.tt)
     #origmanfile=$(echo $manfile | sed -e "s|^$subdir|$origsubdir|")
     echo "| [$manname]($manname.html) | $description |"
 done

diff --git a/bin/mk-md-titlelist b/bin/mk-md-titlelist
index 0e38c16d4997e998d3f00944a3e83975fe25ab57..793dc850666fe68957d9f5f3ea4fa3fcb932766c 100755 (executable)
--- a/bin/mk-md-titlelist
+++ b/bin/mk-md-titlelist
@@ -36,5 +36,5 @@ foreach my $l (@L) {
 }
 
 foreach my $t (sort keys %entries) {
-    print "<li><a href='$URLBASE$entries{$t}'>$t</a></li>\n";
+    print "      <li><a href='$URLBASE$entries{$t}'>$t</a></li>\n";
 }

diff --git a/build_local b/build_local
index b95e86c2d200bab7c7e92f86ab83f91aede753e4..1c0322d872543005a5b504a36d097daca53f9cb6 100644 (file)
--- a/build_local
+++ b/build_local
@@ -2,5 +2,8 @@
 make suball CHECKOUTS=/Users/vavrat/Development/openssl/web/checkouts PERSONDB=/Users/vavrat/Development/openssl/web/checkouts/data/persondb.yaml FORCE=-f
 make docs CHECKOUTS=/Users/vavrat/Development/openssl/web/checkouts PERSONDB=/Users/vavrat/Development/openssl/web/checkouts/data/persondb.yaml FORCE=-f
   
-  
+#rsync -avRL  --progress --exclude=/Makefile --exclude=.git/*** --exclude=bin/*** --exclude=docs/*** --exclude=tmp-build/*** --exclude=tmp-install/*** --exclude=**/*.md --exclude=**/*.tt --exclude=checkouts/*** --delete-excluded --delete-delay --delay-updates . /tmp/web
+rsync -avRL  --progress --exclude=/Makefile --exclude=/.idea --exclude=/.vscode --exclude=**/*.cross --exclude=**/*.yaml --exclude=**/*.inc --exclude=.git/*** --exclude=bin/*** --exclude=tmp-build/*** --exclude=tmp-install/*** --exclude=**/*.md --exclude=**/*.tt --exclude=checkouts/*** --delete-excluded --delete-delay --delay-updates . /tmp/web
+#rsync -av --exclude=**/*.md  --exclude=**/*.tt  --exclude=**/*.cross --exclude=**/*.inc --delete-excluded --delete-delay --delay-updates docs/ /tmp/web/docs
+
 #make all CHECKOUTS=/Users/vavrat/Development/openssl/web/checkouts PERSONDB=/Users/vavrat/Development/openssl/web/checkouts/data/persondb.yaml FORCE=-f
\ No newline at end of file

diff --git a/policies/general/dirdata.yaml.tt b/policies/general/dirdata.yaml.tt
index fdc38c94fea2e44730cba433a28f3ed255cda6b5..af29d7a9d405cc3e9c6434c94b8d99362514e7a5 100644 (file)
--- a/policies/general/dirdata.yaml.tt
+++ b/policies/general/dirdata.yaml.tt
@@ -3,7 +3,6 @@ breadcrumbs: >-
   [Home](/) : [Policies](/policies) : [General](.)
 sidebar: |
   # [General Policies](.)
-
   -   [Release Strategy](../releasestrat.html)
-      [% INCLUDE "index.inc" %]
+[% INCLUDE "index.inc" %]
 ---