Skip to content

Commit 89822ee

Browse files
author
Junio C Hamano
committed
Meta/dodoc.sh: do not lose index.html
1 parent c192899 commit 89822ee

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

dodoc.sh

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ do
6969
rm -fr doc-$type-inst
7070
done
7171

72-
make >../:html.log 2>&1 \
72+
make >./:html.log 2>&1 \
7373
-C Documentation -j 2 \
7474
WEBDOC_DEST="$DOCREPO/doc-html-inst" install-webdoc || exit
7575

76-
make >../:man.log 2>&1 \
76+
make >./:man.log 2>&1 \
7777
-C Documentation -j 2 \
7878
man1="$DOCREPO/doc-man-inst/man1" \
7979
man7="$DOCREPO/doc-man-inst/man7" \
@@ -102,7 +102,19 @@ do
102102
(
103103
cd doc-${type}pages
104104

105-
if git commit -a -m "Autogenerated docs for $NID"
105+
case "$type" in
106+
html)
107+
TYPE='HTML docs'
108+
rm -f index.html
109+
ln -sf git.html index.html
110+
git add index.html
111+
;;
112+
man)
113+
TYPE='manpages'
114+
;;
115+
esac
116+
117+
if git commit -a -m "Autogenerated $TYPE for $NID"
106118
then
107119
git send-pack "$MASTERREPO" master:refs/heads/$type
108120
else
@@ -115,7 +127,7 @@ if test -d $PUBLIC
115127
then
116128
# This is iffy...
117129
mv Documentation/git.html Documentation/saved-git-html
118-
make >>../:html.log 2>&1 \
130+
make >>./:html.log 2>&1 \
119131
-C Documentation \
120132
WEBDOC_DEST="$PUBLIC" ASCIIDOC_EXTRA='-a stalenotes' \
121133
install-webdoc &&

0 commit comments

Comments
 (0)