From a8b3580679081fa562cead6aa9b65ce602a308c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 19 Apr 2021 15:33:46 +0200
Subject: [PATCH] configure: Rename --no-steam-runtime to --no-proton-sdk.

---
 README.md    |  2 +-
 configure.sh | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 2484d89a..a46e01df 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,7 @@ protonsdk_version value to use):
 
 Or, if you are building without the Steam runtime, then instead use:
 
-        ../proton/configure.sh --no-steam-runtime
+        ../proton/configure.sh --no-proton-sdk
 
 **Tip**: If you are building without the Steam runtime, you should now run
 `make obj-wine64/Makefile obj-wine32/Makefile` and check the files
diff --git a/configure.sh b/configure.sh
index f9bcb989..eae6605b 100755
--- a/configure.sh
+++ b/configure.sh
@@ -98,7 +98,7 @@ function configure() {
 
 arg_steamrt="soldier"
 arg_protonsdk_image=""
-arg_no_steamrt=""
+arg_no_protonsdk=""
 arg_build_name=""
 arg_docker_opts=""
 arg_help=""
@@ -146,8 +146,8 @@ function parse_args() {
     elif [[ $arg = --steam-runtime ]]; then
       val_used=1
       arg_steamrt="$val"
-    elif [[ $arg = --no-steam-runtime ]]; then
-      arg_no_steamrt=1
+    elif [[ $arg = --no-proton-sdk ]]; then
+      arg_no_protonsdk=1
     else
       err "Unrecognized option $arg"
       return 1
@@ -182,7 +182,7 @@ function parse_args() {
 }
 
 usage() {
-  "$1" "Usage: $0 { --no-steam-runtime | --proton-sdk-image=<image> --steam-runtime=<name> }"
+  "$1" "Usage: $0 { --no-proton-sdk | --proton-sdk-image=<image> --steam-runtime=<name> }"
   "$1" "  Generate a Makefile for building Proton.  May be run from another directory to create"
   "$1" "  out-of-tree build directories (e.g. mkdir mybuild && cd mybuild && ../configure.sh)"
   "$1" ""
@@ -203,8 +203,8 @@ usage() {
   "$1" "                                create this image."
   "$1" "    --steam-runtime=soldier  Name of the steam runtime release to build for (soldier, scout)."
   "$1" ""
-  "$1" "    --no-steam-runtime  Do not automatically invoke any runtime SDK as part of the build."
-  "$1" "                        Build steps may still be manually run in a runtime environment."
+  "$1" "    --no-proton-sdk  Do not automatically invoke any runtime SDK as part of the build."
+  "$1" "                     Build steps may still be manually run in a runtime environment."
   exit 1;
 }
 
@@ -213,10 +213,10 @@ parse_args "$@" || usage err
 [[ -z $arg_help ]] || usage info
 
 # Sanity check arguments
-if [[ -n $arg_no_steamrt && -n $arg_protonsdk_image ]]; then
-    die "Cannot specify --proton-sdk-image as well as --no-steam-runtime"
-elif [[ -z $arg_no_steamrt && -z $arg_protonsdk_image ]]; then
-    die "Must specify either --no-steam-runtime or --proton-sdk-image"
+if [[ -n $arg_no_protonsdk && -n $arg_protonsdk_image ]]; then
+    die "Cannot specify --proton-sdk-image as well as --no-proton-sdk"
+elif [[ -z $arg_no_protonsdk && -z $arg_protonsdk_image ]]; then
+    die "Must specify either --no-proton-sdk or --proton-sdk-image"
 fi
 
 configure "$arg_protonsdk_image" "$arg_steamrt"