Merge pull request #38629 from soltysh/fix_copy

Automatic merge from submit-queue (batch tested with PRs 38453, 36672, 38629, 34966, 38630) Fix staging/copy.sh to work on mac and linux @smarterclayton ptal

Merge pull request #38629 from soltysh/fix_copy
43dda9c6 · Kubernetes Submit Queue · GitHub · 3d29c3d2 · 6bc12f2a · 43dda9c6
Commit 43dda9c6 authored Dec 12, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 12, 2016
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

copy.sh staging/copy.sh +2 -4

No files found.
--- a/staging/copy.sh
+++ b/staging/copy.sh
@@ -17,7 +17,6 @@
 set -o errexit
 set -o nounset
 set -o pipefail
-set -x
 VERIFYONLY=false
 while getopts ":v" opt; do
@@ -45,8 +44,7 @@ CLIENT_REPO_TEMP="${MAIN_REPO}/staging/src/${CLIENT_REPO_TEMP_FROM_SRC}"
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cleanup() {
-    ls "${CLIENT_REPO_TEMP}"
+    rm -rf "${CLIENT_REPO_TEMP}"
-    # rm -rf "${CLIENT_REPO_TEMP}"
 }
 trap cleanup EXIT SIGINT
@@ -88,7 +86,7 @@ GO15VENDOREXPERIMENT=1 godep save ./...
 popd > /dev/null
 echo "moving vendor/k8s.io/kubernetes"
-cp -rn "${CLIENT_REPO_TEMP}"/vendor/k8s.io/kubernetes/ "${CLIENT_REPO_TEMP}"/ || true
+cp -rn "${CLIENT_REPO_TEMP}"/vendor/k8s.io/kubernetes/* "${CLIENT_REPO_TEMP}"/
 rm -rf "${CLIENT_REPO_TEMP}"/vendor/k8s.io/kubernetes
 # client-go will share the vendor of the main repo for now. When client-go
 # becomes a standalone repo, it will have its own vendor