github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 06:43:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40660 from sttts/sttts-fix-staging-copy-on-mac

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39832, 40660)

staging/copy.sh: fix on mac

BSD-vs-GNU `sed -i`. This variant works on both.
This commit is contained in:
Kubernetes Submit Queue 2017-01-30 01:32:16 -08:00 committed by GitHub
commit 5d8e607ef2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/copy.sh
View File

@ -42,7 +42,7 @@ CLIENT_REPO="${MAIN_REPO}/staging/src/${CLIENT_REPO_FROM_SRC}"
CLIENT_REPO_TEMP="${MAIN_REPO}/staging/src/${CLIENT_REPO_TEMP_FROM_SRC}" 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)"
sedi="-i" sedi="-i=''"
cleanup() { cleanup() {
rm -rf "${CLIENT_REPO_TEMP}" rm -rf "${CLIENT_REPO_TEMP}"