Return-Path: 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 E74CE200CC2 for ; Tue, 20 Jun 2017 23:52:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E5BBD160BCC; Tue, 20 Jun 2017 21:52:12 +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 406FB160BE1 for ; Tue, 20 Jun 2017 23:52:12 +0200 (CEST) Received: (qmail 78787 invoked by uid 500); 20 Jun 2017 21:52:11 -0000 Mailing-List: contact commits-help@jspwiki.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jspwiki.apache.org Delivered-To: mailing list commits@jspwiki.apache.org Received: (qmail 78763 invoked by uid 99); 20 Jun 2017 21:52:09 -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, 20 Jun 2017 21:52:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3F9EADFE8F; Tue, 20 Jun 2017 21:52:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: juanpablo@apache.org To: commits@jspwiki.apache.org Date: Tue, 20 Jun 2017 21:52:10 -0000 Message-Id: <90e6254f90dc4c438af65f192ba42a56@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] jspwiki-site git commit: mv doesn't overwrite existing files, switching to cp -rf archived-at: Tue, 20 Jun 2017 21:52:13 -0000 mv doesn't overwrite existing files, switching to cp -rf Project: http://git-wip-us.apache.org/repos/asf/jspwiki-site/repo Commit: http://git-wip-us.apache.org/repos/asf/jspwiki-site/commit/f777118e Tree: http://git-wip-us.apache.org/repos/asf/jspwiki-site/tree/f777118e Diff: http://git-wip-us.apache.org/repos/asf/jspwiki-site/diff/f777118e Branch: refs/heads/jbake Commit: f777118e00f8a9329b4a83f194d40327dd611502 Parents: 3f11472 Author: Juan Pablo Santos Rodriguez Authored: Tue Jun 20 23:46:54 2017 +0200 Committer: Juan Pablo Santos Rodriguez Committed: Tue Jun 20 23:46:54 2017 +0200 ---------------------------------------------------------------------- ci.sh | 2 +- mvn-ci.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/f777118e/ci.sh ---------------------------------------------------------------------- diff --git a/ci.sh b/ci.sh index 8bd4778..7ecad39 100755 --- a/ci.sh +++ b/ci.sh @@ -5,7 +5,7 @@ git checkout asf-site git clean -f -d git pull origin asf-site find . -type d | grep -v target | grep -v .git | grep -v apidocs | xargs rm -rf -mv target/content/* ./ +cp -rf target/content/* ./ rm -rf target git add . git commit -m "Automatic Site Publish by Buildbot" http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/f777118e/mvn-ci.sh ---------------------------------------------------------------------- diff --git a/mvn-ci.sh b/mvn-ci.sh index 871f205..53dad29 100755 --- a/mvn-ci.sh +++ b/mvn-ci.sh @@ -5,7 +5,7 @@ git checkout asf-site git clean -f -d git pull origin asf-site find . -type d | grep -v target | grep -v .git | grep -v apidocs | xargs rm -rf -mv target/content/* ./ +cp -rf target/content/* ./ rm -rf target git add . git commit -m "Site + Apidocs Maven Publish"