Skip to content

Commit 35373d8

Browse files
Merge pull request openshift#2183 from zhiweiyin318/fix-updata-codegen
fix vendor is not put back and failed on MAC env after run update-codegen.sh
2 parents 69c024e + 95149d4 commit 35373d8

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

hack/update-codegen.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,16 @@
33
SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
44
CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../../../k8s.io/code-generator)}
55

6+
# use gsed for MAC env
7+
SED_CMD=sed
8+
if [[ `uname` == 'Darwin' ]]; then
9+
SED_CMD=gsed
10+
fi
11+
612
# HACK: For some reason this script is not executable.
7-
sed -i 's,^exec \(.*/generate-internal-groups.sh\),bash \1,g' ${CODEGEN_PKG}/generate-groups.sh
13+
${SED_CMD} -i 's,^exec \(.*/generate-internal-groups.sh\),bash \1,g' ${CODEGEN_PKG}/generate-groups.sh
814
# ...but we have to put it back, or `verify` will puke.
9-
trap "git checkout ${CODEGEN_PKG}/generate-internal-groups.sh" EXIT
15+
trap "git checkout ${CODEGEN_PKG}/generate-groups.sh" EXIT
1016

1117
cd "${SCRIPT_ROOT}"
1218

0 commit comments

Comments
 (0)