aboutsummaryrefslogtreecommitdiff
path: root/travis
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2018-04-30 11:05:14 +0200
committerKristian Evers <kristianevers@gmail.com>2018-04-30 11:05:14 +0200
commitcd23e5f1b2630ee07567bd361373ba725774061b (patch)
treeb33a6e3ad9619a1e9870cfddc316a9bb91e2a36c /travis
parentf8aacfb513c9380c4df3b2dda124c0b1da7aaa3c (diff)
parentd0fefa4104d9b655d59e400cda616f0b4d407071 (diff)
downloadPROJ-cd23e5f1b2630ee07567bd361373ba725774061b.tar.gz
PROJ-cd23e5f1b2630ee07567bd361373ba725774061b.zip
Merge remote-tracking branch 'osgeo/master' into doc-improvements
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/deploy_website.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/travis/deploy_website.sh b/travis/deploy_website.sh
index 80cd03c6..07e2c556 100755
--- a/travis/deploy_website.sh
+++ b/travis/deploy_website.sh
@@ -4,16 +4,16 @@ builddir=$1
destdir=$2
-git clone git@github.com:OSGeo/proj.4.git $destdir/proj4docs
-cd $destdir/proj4docs
+git clone git@github.com:OSGeo/proj.4.git $destdir/projdocs
+cd $destdir/projdocs
git checkout gh-pages
cd $builddir/html
-cp -rf * $destdir/proj4docs
-cp $builddir/latex/proj4.pdf $destdir/proj4docs
+cp -rf * $destdir/projdocs
+cp $builddir/latex/proj.pdf $destdir/projdocs
-cd $destdir/proj4docs
+cd $destdir/projdocs
git config user.email "proj4bot@proj4.bot"
git config user.name "proj.4 deploybot"