Fixed unexpected arguments causing an error in .sh build files.

Util/BuildTools/BuildCarlaUE4.sh

@@ -1,17 +1,5 @@
 #! /bin/bash
 
-# ==============================================================================
-# -- Set up environment --------------------------------------------------------
-# ==============================================================================
-
-source $(dirname "$0")/Environment.sh
-
-if [ ! -d "${UE4_ROOT}" ]; then
-  fatal_error "UE4_ROOT is not defined, or points to a non-existant directory, please set this environment variable."
-else
-  log "Using Unreal Engine at '$UE4_ROOT'"
-fi
-
 # ==============================================================================
 # -- Parse arguments -----------------------------------------------------------
 # ==============================================================================
@@ -71,6 +59,18 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+# ==============================================================================
+# -- Set up environment --------------------------------------------------------
+# ==============================================================================
+
+source $(dirname "$0")/Environment.sh
+
+if [ ! -d "${UE4_ROOT}" ]; then
+  fatal_error "UE4_ROOT is not defined, or points to a non-existant directory, please set this environment variable."
+else
+  log "Using Unreal Engine at '$UE4_ROOT'"
+fi
+
 if ! { ${REMOVE_INTERMEDIATE} || ${BUILD_CARLAUE4} || ${LAUNCH_UE4_EDITOR}; }; then
   fatal_error "Nothing selected to be done."
 fi

Util/BuildTools/BuildLibCarla.sh

@@ -1,12 +1,5 @@
 #! /bin/bash
 
-source $(dirname "$0")/Environment.sh
-
-function get_source_code_checksum {
-  local EXCLUDE='*__pycache__*'
-  find "${LIBCARLA_ROOT_FOLDER}"/* \! -path "${EXCLUDE}" -print0 | sha1sum | awk '{print $1}'
-}
-
 # ==============================================================================
 # -- Parse arguments -----------------------------------------------------------
 # ==============================================================================
@@ -83,6 +76,13 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+source $(dirname "$0")/Environment.sh
+
+function get_source_code_checksum {
+  local EXCLUDE='*__pycache__*'
+  find "${LIBCARLA_ROOT_FOLDER}"/* \! -path "${EXCLUDE}" -print0 | sha1sum | awk '{print $1}'
+}
+
 if ! { ${REMOVE_INTERMEDIATE} || ${BUILD_SERVER} || ${BUILD_CLIENT}; }; then
   fatal_error "Nothing selected to be done."
 fi

Util/BuildTools/BuildOSM2ODR.sh

@@ -1,12 +1,4 @@
 #! /bin/bash
-
-source $(dirname "$0")/Environment.sh
-
-function get_source_code_checksum {
-  local EXCLUDE='*__pycache__*'
-  find "${OSM2ODR_ROOT_FOLDER}"/* \! -path "${EXCLUDE}" -print0 | sha1sum | awk '{print $1}'
-}
-
 DOC_STRING="Build OSM2ODR."
 
 USAGE_STRING=$(cat <<- END
@@ -48,6 +40,13 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+source $(dirname "$0")/Environment.sh
+
+function get_source_code_checksum {
+  local EXCLUDE='*__pycache__*'
+  find "${OSM2ODR_ROOT_FOLDER}"/* \! -path "${EXCLUDE}" -print0 | sha1sum | awk '{print $1}'
+}
+
 if ! { ${REMOVE_INTERMEDIATE} || ${BUILD_OSM2ODR}; }; then
   fatal_error "Nothing selected to be done."
 fi

Util/BuildTools/BuildPythonAPI.sh

@@ -1,10 +1,5 @@
 #! /bin/bash
 
-source $(dirname "$0")/Environment.sh
-
-export CC=clang-8
-export CXX=clang++-8
-
 # ==============================================================================
 # -- Parse arguments -----------------------------------------------------------
 # ==============================================================================
@@ -49,6 +44,11 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+source $(dirname "$0")/Environment.sh
+
+export CC=clang-8
+export CXX=clang++-8
+
 if ! { ${REMOVE_INTERMEDIATE} || ${BUILD_PYTHONAPI} ; }; then
   fatal_error "Nothing selected to be done."
 fi

Util/BuildTools/Check.sh

@@ -1,7 +1,5 @@
 #! /bin/bash
 
-source $(dirname "$0")/Environment.sh
-
 # ==============================================================================
 # -- Parse arguments -----------------------------------------------------------
 # ==============================================================================
@@ -92,6 +90,8 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+source $(dirname "$0")/Environment.sh
+
 if ! { ${LIBCARLA_RELEASE} || ${LIBCARLA_DEBUG} || ${PYTHON_API} || ${SMOKE_TESTS}; }; then
   fatal_error "Nothing selected to be done."
 fi

Util/BuildTools/Deploy.sh

@@ -4,7 +4,7 @@
 # -- Set up environment --------------------------------------------------------
 # ==============================================================================
 
-source $(dirname "$0")/Environment.sh
+
 
 REPLACE_LATEST=false
 DOCKER_PUSH=false
@@ -48,6 +48,8 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+source $(dirname "$0")/Environment.sh
+
 REPOSITORY_TAG=$(get_git_repository_version)
 
 LATEST_PACKAGE=CARLA_${REPOSITORY_TAG}.tar.gz

Util/BuildTools/Package.sh

@@ -1,7 +1,5 @@
 #! /bin/bash
 
-source $(dirname "$0")/Environment.sh
-
 # ==============================================================================
 # -- Parse arguments -----------------------------------------------------------
 # ==============================================================================
@@ -51,6 +49,7 @@ done
 # ==============================================================================
 # -- Prepare environment -------------------------------------------------------
 # ==============================================================================
+source $(dirname "$0")/Environment.sh
 
 if [ ! -d "${UE4_ROOT}" ]; then
   fatal_error "UE4_ROOT is not defined, or points to a non-existent directory, please set this environment variable."