openstack/openstack-manuals
Code Issues Proposed changes

Use real script for copying files over

Browse Source 
The current commands in tox.ini fail if there are no files to copy over.
Let's use instead a proper script that takes care that some files
actually exist.

Change-Id: I6feeebf4b5febd56d767730672bb64ee305721b0
This commit is contained in:
Andreas Jaeger 2014-10-13 21:42:06 +02:00
parent ccf326217d
commit 28bab570e2
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tools/copy-to-branch.sh Executable file
View File

@ -0,0 +1,36 @@
#!/bin/bash -xe
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# Copy files from trunk to named branch and replace all links from
# trunk with links to the branch
BRANCH=$1
if [ -z "$BRANCH" ] ; then
echo "usage $0 BRANCH"
exit 1
fi
if [ -e publish-docs/trunk ] ; then
# Copy files over
cp -a publish-docs/trunk publish-docs/$BRANCH
for f in $(find publish-docs/$BRANCH -name "atom.xml") ; do
sed -i -e "s|/trunk/|/$BRANCH/|g" $f
done
for f in $(find publish-docs/$BRANCH -name "*.html") ; do
sed -i -e "s|/trunk/|/$BRANCH/|g" $f
done
fi

5
tox.ini
View File

@ -58,10 +58,7 @@ commands =
# TODO(jaegerandi): Remove the following lines before we branch off # TODO(jaegerandi): Remove the following lines before we branch off
# an juno branch. # an juno branch.
# Publish install-guide and config-reference to /juno # Publish install-guide and config-reference to /juno
cp -a publish-docs/trunk publish-docs/juno bash tools/copy-to-branch.sh juno
# Replace links to /trunk with links to /juno/
# This needs bash so that tox does not interpret the *
bash -c "sed -i -e 's|/trunk/|/juno/|g' publish-docs/juno/*/atom.xml publish-docs/juno/*/*/*/atom.xml publish-docs/juno/*/*.html publish-docs/juno/*/*/*/*/*.html publish-docs/juno/*/*/*/*.html publish-docs/juno/*/*/*.html publish-docs/juno/*/*.html"
# END Juno duplication. # END Juno duplication.
# Now publish www as well, we cannot do this from # Now publish www as well, we cannot do this from
# openstack-doc-test. Use rsync so that .htaccess gets also # openstack-doc-test. Use rsync so that .htaccess gets also