github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38629 from soltysh/fix_copy

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue
2016-12-12 11:41:08 -08:00
committed by GitHub
parent 3d29c3d229 6bc12f2a69
commit 43dda9c64f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
staging/copy.sh
View File

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