github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

fix hack/make-rules/make-help.sh shellcheck failures

Browse Source
This commit is contained in:
Benjamin Elder 2019-06-23 17:17:38 -07:00
parent 1215aa73d2
commit 0fad8eb36c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.shellcheck_failures
View File

@ -21,7 +21,6 @@
./hack/lib/swagger.sh ./hack/lib/swagger.sh
./hack/lib/test.sh ./hack/lib/test.sh
./hack/lib/version.sh ./hack/lib/version.sh
./hack/make-rules/make-help.sh
./hack/test-integration.sh ./hack/test-integration.sh
./hack/verify-test-featuregates.sh ./hack/verify-test-featuregates.sh
./test/cmd/diff.sh ./test/cmd/diff.sh

11
hack/make-rules/make-help.sh
View File

@ -21,22 +21,21 @@ set -o pipefail
readonly red=$(tput setaf 1) readonly red=$(tput setaf 1)
readonly reset=$(tput sgr0) readonly reset=$(tput sgr0)
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
ALL_TARGETS=$(make -C "${KUBE_ROOT}" PRINT_HELP=y -rpn | sed -n -e '/^$/ { n ; /^[^ .#][^ ]*:/ { s/:.*$// ; p ; } ; }' | sort) ALL_TARGETS=$(make -C "${KUBE_ROOT}" PRINT_HELP=y -rpn | sed -n -e '/^$/ { n ; /^[^ .#][^ ]*:/ { s/:.*$// ; p ; } ; }' | sort)
CMD_TARGETS=$(ls -l "${KUBE_ROOT}/cmd" |awk '/^d/ {print $NF}') CMD_TARGETS=$(cd "${KUBE_ROOT}/cmd"; find . -type d -mindepth 1 -maxdepth 1 | cut -c 3-)
CMD_FLAG=false CMD_FLAG=false
PLUGIN_CMD_FLAG=false
echo "--------------------------------------------------------------------------------" echo "--------------------------------------------------------------------------------"
for tar in ${ALL_TARGETS}; do for tar in ${ALL_TARGETS}; do
for cmdtar in ${CMD_TARGETS}; do for cmdtar in ${CMD_TARGETS}; do
if [ ${tar} = ${cmdtar} ]; then if [ "${tar}" = "${cmdtar}" ]; then
if [ ${CMD_FLAG} = true ]; then if [ ${CMD_FLAG} = true ]; then
continue 2; continue 2;
fi fi
echo -e "${red}${CMD_TARGETS}${reset}" echo -e "${red}${CMD_TARGETS}${reset}"
make -C "${KUBE_ROOT}" ${tar} PRINT_HELP=y make -C "${KUBE_ROOT}" "${tar}" PRINT_HELP=y
echo "---------------------------------------------------------------------------------" echo "---------------------------------------------------------------------------------"
CMD_FLAG=true CMD_FLAG=true
@ -45,6 +44,6 @@ for tar in ${ALL_TARGETS}; do
done done
echo -e "${red}${tar}${reset}" echo -e "${red}${tar}${reset}"
make -C "${KUBE_ROOT}" ${tar} PRINT_HELP=y make -C "${KUBE_ROOT}" "${tar}" PRINT_HELP=y
echo "---------------------------------------------------------------------------------" echo "---------------------------------------------------------------------------------"
done done