Return-Path: <commits-return-13133-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 9116A200B8B
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue,  4 Oct 2016 19:56:57 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 8F8F9160AC7; Tue,  4 Oct 2016 17:56:57 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id D5979160ADC
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  4 Oct 2016 19:56:56 +0200 (CEST)
Received: (qmail 61888 invoked by uid 500); 4 Oct 2016 17:56:55 -0000
Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@tinkerpop.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@tinkerpop.apache.org>
List-Post: <mailto:commits@tinkerpop.apache.org>
List-Id: <commits.tinkerpop.apache.org>
Reply-To: dev@tinkerpop.apache.org
Delivered-To: mailing list commits@tinkerpop.apache.org
Received: (qmail 61854 invoked by uid 99); 4 Oct 2016 17:56:55 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Oct 2016 17:56:55 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id A88D8E04BE; Tue,  4 Oct 2016 17:56:55 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dkuppitz@apache.org
To: commits@tinkerpop.apache.org
Date: Tue, 04 Oct 2016 17:56:56 -0000
Message-Id: <fa620439b0684b9c880fd062f7fa7c52@git.apache.org>
In-Reply-To: <6330d59107d34798899b37633e6a37dd@git.apache.org>
References: <6330d59107d34798899b37633e6a37dd@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/3] tinkerpop git commit: CTR: Handle new directories properly in
 `publish-docs.sh`.
archived-at: Tue, 04 Oct 2016 17:56:57 -0000

CTR: Handle new directories properly in `publish-docs.sh`.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ffe0b1f5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ffe0b1f5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ffe0b1f5

Branch: refs/heads/master
Commit: ffe0b1f55af41e649961374e14b251d795286bed
Parents: 9ba6806
Author: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Authored: Tue Oct 4 19:49:41 2016 +0200
Committer: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Committed: Tue Oct 4 19:49:41 2016 +0200

----------------------------------------------------------------------
 bin/publish-docs.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ffe0b1f5/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index 49ed9bd..739deb5 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -53,15 +53,23 @@ diff -rq -I 'Generated by javadoc' -I '^<meta name="date"' javadocs/${VERSION}/
 # copy new / modified files
 for file in $(cat ../publish-docs.docs | awk '/^[AU]/ {print $2}' | grep -v '.graffle$')
 do
-  cp "../docs/htmlsingle/${file}" "docs/${VERSION}/${file}"
+  if [ -d "../docs/htmlsingle/${file}" ]; then
+    mkdir -p "docs/${VERSION}/${file}" && cp -r "../docs/htmlsingle/${file}"/* "$_"
+  else
+    mkdir -p "docs/${VERSION}/`dirname ${file}`" && cp "../docs/htmlsingle/${file}" "$_"
+  fi
 done
 for file in $(cat ../publish-docs.javadocs | awk '/^[AU]/ {print $2}')
 do
-  cp "../site/apidocs/${file}" "javadocs/${VERSION}/${file}"
+  if [ -d "../site/apidocs/${file}" ]; then
+    mkdir -p "javadocs/${VERSION}/${file}" && cp -r "../site/apidocs/${file}"/* "$_"
+  else
+    mkdir -p "javadocs/${VERSION}/`dirname ${file}`" && cp "../site/apidocs/${file}" "$_"
+  fi
 done
 
-pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^A/ {print $2}' | grep -v '.graffle$' | xargs --no-run-if-empty svn add; popd
-pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.javadocs | awk '/^A/ {print $2}' | xargs --no-run-if-empty svn add; popd
+pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^A/ {print $2}' | grep -v '.graffle$' | xargs --no-run-if-empty svn add --parents; popd
+pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.javadocs | awk '/^A/ {print $2}' | xargs --no-run-if-empty svn add --parents; popd
 
 # delete old files
 pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd