drop show_help_if_requested
We added this logic when we were trying to make these programs more
"user friendly" and hiding options that were for builders only. At
this point, only three scripts were using it anymore (build_sdk_board
is only for builders). Lets drop this helper to tighten up logic a
bit even if it means these scripts (re)gain user-visible options.
When these move to chromite, we have more flexibility to mark options
as "builder" or "advanced". We did that with setup_board already.
BUG=None
TEST=CQ passes
Change-Id: I5552322eb5d6f6209a017f01f65455a46eabc907
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/1838453
Reviewed-by: Alex Klein <saklein@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/build_image b/build_image
index b05d511..7d974ea 100755
--- a/build_image
+++ b/build_image
@@ -62,7 +62,6 @@
adjust_part='STATE:=1G' -- make the stateful partition 1 GB
...
"
-show_help_if_requested "$@"
# The following options are advanced options, only available to those willing
# to read the source code. They are not shown in help output, since they are
diff --git a/build_packages b/build_packages
index e391a7d..adff8e0 100755
--- a/build_packages
+++ b/build_packages
@@ -55,7 +55,6 @@
For the fastest builds, use --nowithautotest --noworkon.
"
-show_help_if_requested "$@"
# The following options are advanced options, only available to those willing
# to read the source code. They are not shown in help output, since they are
diff --git a/build_sdk_board b/build_sdk_board
index 8c4c226..8efc674 100755
--- a/build_sdk_board
+++ b/build_sdk_board
@@ -25,7 +25,6 @@
setup_host_board builds the chroot for the amd64-host (chroot) board.
This should not need to be called except by the SDK Builder.
"
-show_help_if_requested "$@"
# Parse command line flags
FLAGS "$@" || exit 1
diff --git a/common.sh b/common.sh
index c1c84d2..ffdc741 100644
--- a/common.sh
+++ b/common.sh
@@ -779,25 +779,6 @@
fi
}
-# Display --help if requested. This is used to hide options from help
-# that are not intended for developer use.
-#
-# How to use:
-# 1) Declare the options that you want to appear in help.
-# 2) Call this function.
-# 3) Declare the options that you don't want to appear in help.
-#
-# See build_packages for example usage.
-show_help_if_requested() {
- local opt
- for opt in "$@"; do
- if [[ ${opt} == "-h" || ${opt} == "--help" ]]; then
- flags_help
- exit 0
- fi
- done
-}
-
switch_to_strict_mode() {
# Set up strict execution mode; note that the trap
# must follow switch_to_strict_mode, else it will have no effect.
diff --git a/update_chroot b/update_chroot
index 2722019..6773daf 100755
--- a/update_chroot
+++ b/update_chroot
@@ -21,7 +21,6 @@
Performs an update of the chroot. This script is called as part of
build_packages, so there is typically no need to call this script directly.
"
-show_help_if_requested "$@"
# The following options are advanced options, only available to those willing
# to read the source code. They are not shown in help output, since they are
