Skip to content

Commit

Permalink
Fix hack scripts on Mac
Browse files Browse the repository at this point in the history
Use POSIX flags and do not expect bash 4.
  • Loading branch information
sttts authored and deads2k committed Apr 27, 2017
1 parent 566b41b commit 5cac278
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions hack/lib/util/docs.sh
Expand Up @@ -109,18 +109,18 @@ readonly -f os::util::gen-docs
# os::util::set-man-placeholder puts a placeholder for every generated manpage.
function os::util::set-man-placeholder() {
MAN_OUTPUT_DIR="$1"
declare -A generated_files=( ["${1}/.files_generated_oadm"]="${1}/.files_generated_oadm"
["${1}/.files_generated_oc"]="${1}/.files_generated_oc"
["${1}/.files_generated_openshift"]="${1}/.files_generated_openshift" )
declare -a generated_files=( "${1}/.files_generated_oadm=${1}/.files_generated_oadm"
"${1}/.files_generated_oc=${1}/.files_generated_oc"
"${1}/.files_generated_openshift=${1}/.files_generated_openshift" )

# remove all of the old manpages; we don't want to check them in.
for generated_file in "${generated_files[@]}"; do
while read file; do
generated_man="$MAN_OUTPUT_DIR/${file}"
if [[ "${generated_man}" != "${generated_files[$generated_file]}" ]]; then
cp "${OS_ROOT}/hack/autogenerated_placeholder.txt" "${generated_man}"
if [[ "${generated_man}" != "${generated_file##}" ]]; then
cp "${OS_ROOT}/hack/autogenerated_placeholder.txt" "${generated_man#*=}"
fi
done <"${generated_file}"
done <"${generated_file%%=*}"
done
}
readonly -f os::util::set-man-placeholder
Expand Down
2 changes: 1 addition & 1 deletion hack/update-generated-listers.sh
Expand Up @@ -13,7 +13,7 @@ INPUT_DIRS=$(
grep -v 'pkg\/security\/api' | \
sort -u | \
sed "s,^,${PREFIX}," | \
paste -sd,
paste -sd, -
)

genlisters \
Expand Down
2 changes: 1 addition & 1 deletion hack/update-generated-swagger-spec.sh
Expand Up @@ -58,7 +58,7 @@ generated_file="${SWAGGER_SPEC_OUT_DIR}/openshift-openapi-spec.json"
oc get --raw "/swagger.json" --config="${MASTER_CONFIG_DIR}/admin.kubeconfig" > "${generated_file}"

os::util::sed 's|https://127.0.0.1:38443|https://127.0.0.1:8443|g' "${generated_file}"
os::util::sed -r 's|"version": "[^\"]+"|"version": "latest"|g' "${generated_file}"
os::util::sed -E 's|"version": "[^\"]+"|"version": "latest"|g' "${generated_file}"
printf '\n' >> "${generated_file}"

# Copy all protobuf generated specs into the api/protobuf-spec directory
Expand Down

0 comments on commit 5cac278

Please sign in to comment.