Simplify Scripts

scripts/build.sh

@@ -2,13 +2,15 @@
 
 set -e
 
-# Build
-build() {
-    # Use Build Dir
+# Variables
+MODE="$(echo "$1" | tr '[:upper:]' '[:lower:]')"
+ARCH="$(echo "$2" | tr '[:upper:]' '[:lower:]')"
+
+# Run CMake If Needed
 if [ ! -f "build/${MODE}-${ARCH}/arm/build.ninja" ] || [ ! -f "build/${MODE}-${ARCH}/native/build.ninja" ]; then
-        # Run CMake
     ./scripts/setup.sh "${MODE}" "${ARCH}"
 fi
+# Use Build Dir
 cd "build/${MODE}-${ARCH}"
 
 # Create Prefix
@@ -32,12 +34,3 @@ build() {
 
 # Exit
 cd ../../
-}
-
-# Variables
-MODE="$(echo "$1" | tr '[:upper:]' '[:lower:]')"
-ARCH="$(echo "$2" | tr '[:upper:]' '[:lower:]')"
-shift 2
-
-# Build
-build "${MODE}" "${ARCH}"

scripts/setup.sh

@@ -5,8 +5,17 @@ set -e
 # ARM Toolchain File
 ARM_TOOLCHAIN_FILE="$(pwd)/cmake/toolchain/armhf-toolchain.cmake"
 
-# Setup
-setup() {
+# Variables
+MODE="$(echo "$1" | tr '[:upper:]' '[:lower:]')"
+ARCH="$(echo "$2" | tr '[:upper:]' '[:lower:]')"
+shift 2
+
+# Verify Mode
+if [ "${MODE}" != "client" ] && [ "${MODE}" != "server" ]; then
+    echo "Invalid Mode: ${MODE}" > /dev/stderr
+    exit 1
+fi
+
 # Find Toolchain
 toolchain_file="$(pwd)/cmake/toolchain/${ARCH}-toolchain.cmake"
 if [ ! -f "${toolchain_file}" ]; then
@@ -46,18 +55,3 @@ setup() {
 
 # Exit
 cd ../../
-}
-
-# Variables
-MODE="$(echo "$1" | tr '[:upper:]' '[:lower:]')"
-ARCH="$(echo "$2" | tr '[:upper:]' '[:lower:]')"
-shift 2
-
-# Verify Mode
-if [ "${MODE}" != "client" ] && [ "${MODE}" != "server" ]; then
-    echo "Invalid Mode: ${MODE}" > /dev/stderr
-    exit 1
-fi
-
-# Setup
-setup "$@"