From c731caa23d5b4d23b5d62961ee52368cbb1994c8 Mon Sep 17 00:00:00 2001 From: Florent Rougon Date: Tue, 20 Oct 2020 10:29:41 +0200 Subject: [PATCH] download_and_compile.sh: rename --sg-cmake-args to --sg-cmake-arg and --fg-cmake-args to --fg-cmake-arg This is more logical this way, since every use of such an option specifies exactly *one* additional argument to pass to CMake. --- download_and_compile.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index e564a70..4e9aaed 100755 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -880,10 +880,10 @@ function _usage() { echo " Override the default branch for COMPONENT. For the specified" echo " component, this overrides the effect of options -s and --lts." echo " This option may be given several times." - echo " --sg-cmake-args=ARGUMENT" + echo " --sg-cmake-arg=ARGUMENT" echo " Pass ARGUMENT to CMake when building SimGear." echo " This option may be given several times." - echo " --fg-cmake-args=ARGUMENT" + echo " --fg-cmake-arg=ARGUMENT" echo " Pass ARGUMENT to CMake when building FlightGear." echo " This option may be given several times." echo " --compositor" @@ -1022,7 +1022,7 @@ fi TEMP=$($getopt -o '+shc:p:a:d:r:j:O:ib:' \ --longoptions cleanup,git-clone-default-proto:,git-clone-site-params:,lts \ --longoptions package-manager:,sudo:,ignore-intercomponent-deps,compositor \ - --longoptions component-branch:,sg-cmake-args:,fg-cmake-args:,non-interactive \ + --longoptions component-branch:,sg-cmake-arg:,fg-cmake-arg:,non-interactive \ --longoptions help,version \ -n "$PROGNAME" -- "$@") @@ -1065,9 +1065,9 @@ while true; do shift 2 ;; - --sg-cmake-args) + --sg-cmake-arg) SG_CMAKE_ARGS+=("$2"); shift 2 ;; - --fg-cmake-args) + --fg-cmake-arg) FG_CMAKE_ARGS+=("$2"); shift 2 ;; -a) APT_GET_UPDATE="$2"; shift 2 ;; -c) COMPILE="$2"; shift 2 ;;