From cd1e6cf48696d230b3f20351a2813d9517c3e774 Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Tue, 20 Mar 2018 22:06:24 -0700 Subject: [PATCH] more --- Makefile.am | 22 +++++++++++----------- update-docs-site | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0d65f6ec1..eb7297e17 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,22 +49,22 @@ dox: doxygen dox-site-update: - if [[ !( -d subgit/gh-pages ) ]]; then git clone -b gh-pages https://github.com/joncampbell123/dosbox-x.git subgit/gh-pages; fi - (cd subgit/gh-pages && rm -Rfv doxygen) - cp -Rf doxygen subgit/gh-pages/ - (cd subgit/gh-pages && git add doxygen/) - (cd subgit/gh-pages && git commit doxygen/) + if [[ !( -d ../dosbox-x-gh-pages ) ]]; then git clone -b gh-pages https://github.com/joncampbell123/dosbox-x.git ../dosbox-x-gh-pages; fi + (cd ../dosbox-x-gh-pages && rm -Rfv doxygen) + cp -Rf doxygen ../dosbox-x-gh-pages/ + (cd ../dosbox-x-gh-pages && git add doxygen/) + (cd ../dosbox-x-gh-pages && git commit doxygen/) compat-site-update: - if [[ !( -d subgit/gh-pages ) ]]; then git clone -b gh-pages https://github.com/joncampbell123/dosbox-x.git subgit/gh-pages; fi + if [[ !( -d ../dosbox-x-gh-pages ) ]]; then git clone -b gh-pages https://github.com/joncampbell123/dosbox-x.git ../dosbox-x-gh-pages; fi true # ---------- (cd /mnt/main/emu/demotest && ./make-compat-chart.pl) - cp /mnt/main/emu/demotest/compat-chart.html subgit/gh-pages/demoscene-compat.html + cp /mnt/main/emu/demotest/compat-chart.html ../dosbox-x-gh-pages/demoscene-compat.html true # ---------- (cd /mnt/main/emu/msdostest && ./make-compat-chart.pl) - cp /mnt/main/emu/msdostest/compat-chart.html subgit/gh-pages/msdos-compat.html + cp /mnt/main/emu/msdostest/compat-chart.html ../dosbox-x-gh-pages/msdos-compat.html true # ---------- - (cd subgit/gh-pages && git add demoscene-compat.html) - (cd subgit/gh-pages && git add msdos-compat.html) - (cd subgit/gh-pages && git commit -m 'more' {msdos,demoscene}-compat.html) + (cd ../dosbox-x-gh-pages && git add demoscene-compat.html) + (cd ../dosbox-x-gh-pages && git add msdos-compat.html) + (cd ../dosbox-x-gh-pages && git commit -m 'more' {msdos,demoscene}-compat.html) diff --git a/update-docs-site b/update-docs-site index e5334e647..52eb30e7d 100755 --- a/update-docs-site +++ b/update-docs-site @@ -2,8 +2,8 @@ make dox || exit 1 make dox-site-update || exit 1 make compat-site-update -(cd subgit/gh-pages && git commit .) -(cd subgit/gh-pages && git push) +(cd ../dosbox-x-gh-pages && git commit .) +(cd ../dosbox-x-gh-pages && git push) exit 0