diff --git a/hack/generate-docs.sh b/hack/generate-docs.sh index e55defb9bcb..1fdd8fa20a9 100755 --- a/hack/generate-docs.sh +++ b/hack/generate-docs.sh @@ -48,7 +48,3 @@ kube::util::remove-gen-docs shopt -s dotglob cp -af "${KUBE_TEMP}"/* "${KUBE_ROOT}" shopt -u dotglob - -echo "Generated docs have been placed in the repository tree. Running hack/update-munge-docs.sh." - -"${KUBE_ROOT}/hack/update-munge-docs.sh" diff --git a/hack/update-generated-docs.sh b/hack/update-generated-docs.sh index 457b4a4c327..149d81e7b20 100755 --- a/hack/update-generated-docs.sh +++ b/hack/update-generated-docs.sh @@ -51,7 +51,3 @@ shopt -u dotglob # Replace with placeholder docs kube::util::set-placeholder-gen-docs - -echo "Generated docs have been placed in the repository tree. Running hack/update-munge-docs.sh." - -"${KUBE_ROOT}/hack/update-munge-docs.sh" diff --git a/hack/update-munge-docs.sh b/hack/update-munge-docs.sh deleted file mode 100755 index 1c992a7a9de..00000000000 --- a/hack/update-munge-docs.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -# Copyright 2014 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# TODO: remove this script when we have a standalone TOC generator. - -set -o errexit -set -o nounset -set -o pipefail - -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. -source "${KUBE_ROOT}/hack/lib/init.sh" - -git_upstream=$(kube::util::git_upstream_remote_name) -: ${git_upstream:="upstream"} - -kube::golang::setup_env - -make -C "${KUBE_ROOT}" WHAT=cmd/mungedocs - -kube::util::ensure-temp-dir - -kube::util::gen-analytics "${KUBE_ROOT}" - -mungedocs=$(kube::util::find-binary "mungedocs") - -"${mungedocs}" "--upstream=${git_upstream}" "--root-dir=${KUBE_ROOT}/docs/" \ - && ret=0 || ret=$? - -if [[ $ret -eq 1 ]]; then - echo "${KUBE_ROOT}/docs/ requires manual changes. See preceding errors." - exit 1 -elif [[ $ret -gt 1 ]]; then - echo "Error running mungedocs." - exit 1 -fi - -"${mungedocs}" "--upstream=${git_upstream}" \ - "--root-dir=${KUBE_ROOT}/examples/" && ret=0 || ret=$? - -if [[ $ret -eq 1 ]]; then - echo "${KUBE_ROOT}/examples/ requires manual changes. See preceding errors." - exit 1 -elif [[ $ret -gt 1 ]]; then - echo "Error running mungedocs." - exit 1 -fi - -"${mungedocs}" "--upstream=${git_upstream}" \ - "--skip-munges=analytics" \ - "--norecurse" \ - "--root-dir=${KUBE_ROOT}/" && ret=0 || ret=$? -if [[ $ret -eq 1 ]]; then - echo "${KUBE_ROOT}/ requires manual changes. See preceding errors." - exit 1 -elif [[ $ret -gt 1 ]]; then - echo "Error running mungedocs." - exit 1 -fi - -# ex: ts=2 sw=2 et filetype=sh