jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject [2/2] jspwiki-site git commit: mv doesn't overwrite existing files, switching to cp -rf
Date Tue, 20 Jun 2017 21:52:10 GMT
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 <juanpablo@apache.org>
Authored: Tue Jun 20 23:46:54 2017 +0200
Committer: Juan Pablo Santos Rodriguez <juanpablo@apache.org>
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"


Mime
View raw message