From 055183eaa59bbd96cdec2f1148d0ab178e5f78e0 Mon Sep 17 00:00:00 2001 From: John Schoenick Date: Mon, 27 Aug 2018 13:41:56 -0700 Subject: [PATCH] configure.sh: Remove --force --- configure.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/configure.sh b/configure.sh index a7fbd3e8..14c9b7bc 100755 --- a/configure.sh +++ b/configure.sh @@ -74,11 +74,7 @@ function configure() { local srcdir="$(dirname "$0")" # Don't die after this point or we'll have rather unhelpfully deleted the Makefile - if [[ -e ./Makefile ]]; then - [[ -n $arg_force ]] || die "Makefile exists, use --force to reconfigure ($MAKEFILE)" - info "Makefile exists, --force given, removing" - cmd rm "$MAKEFILE" - fi + [[ ! -e "$MAKEFILE" ]] || rm "$MAKEFILE" echo >> "$MAKEFILE" "# Generated by: $THIS_COMMAND" echo >> "$MAKEFILE" "" @@ -97,7 +93,6 @@ function configure() { # Parse arguments # -arg_force="" arg_steamrt32="" arg_steamrt64="" arg_no_steamrt="" @@ -131,9 +126,7 @@ function parse_args() { fi # The args - if [[ $arg = --force ]]; then - arg_force=1 - elif [[ $arg = --steam-runtime32 ]]; then + if [[ $arg = --steam-runtime32 ]]; then val_used=1 arg_steamrt32="$val" elif [[ $arg = --steam-runtime64 ]]; then @@ -179,8 +172,6 @@ usage() { "$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" "" - "$1" " --force Overwrite Makefile if it already exists" - "$1" "" "$1" " Steam Runtime" "$1" " Proton builds that are to be installed & run under the steam client must be built with" "$1" " the Steam Runtime SDK to ensure compatibility. See BUILDING.md for more information."