From de7ccf2a4313398fb29133ad78c5547805233666 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Mon, 3 Jan 2022 11:18:12 -0500
Subject: Add helpful error checks for common user errors.

---
 build.sh   |  6 ++++++
 install.sh | 26 +++++++++++++++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/build.sh b/build.sh
index 63a5d32..98f6249 100755
--- a/build.sh
+++ b/build.sh
@@ -3,6 +3,12 @@ set -e
 CCOPT=
 CXXOPT=
 
+# error if devkitarm is not installed and binutils-arm-none-eabi is not installed
+if ! ([ -v DEVKITARM ] && [ -d "$DEVKITARM/bin" ]) && ! (command -v arm-none-eabi-as &> /dev/null && command -v arm-none-eabi-ar &> /dev/null) ; then
+	echo "Could not find a binutils installation! Re-read the instructions and make sure you've installed either devkitARM or binutils-arm-none-eabi, depending on your system."
+	exit 1
+fi
+
 if [ ! -z "$CC" ]; then CCOPT=CC=$CC; fi
 if [ ! -z "$CXX" ]; then CXXOPT=CXX=$CXX; fi
 make -C gcc clean
diff --git a/install.sh b/install.sh
index 608d82d..6396d3d 100755
--- a/install.sh
+++ b/install.sh
@@ -1,17 +1,21 @@
 #!/bin/sh
 set -e
 if [ "$1" != "" ]; then
-    mkdir -p $1/tools/agbcc
-    mkdir -p $1/tools/agbcc/bin
-    mkdir -p $1/tools/agbcc/include
-    mkdir -p $1/tools/agbcc/lib
-    cp agbcc $1/tools/agbcc/bin/
-    cp old_agbcc $1/tools/agbcc/bin/
-    cp agbcc_arm $1/tools/agbcc/bin/
-    cp -R libc/include $1/tools/agbcc/ #drop include, because we don't want include/include
-    cp ginclude/* $1/tools/agbcc/include/
-    cp libgcc.a $1/tools/agbcc/lib/
-    cp libc.a $1/tools/agbcc/lib/
+	if [ -d "$1" ]; then
+		mkdir -p $1/tools/agbcc
+		mkdir -p $1/tools/agbcc/bin
+		mkdir -p $1/tools/agbcc/include
+		mkdir -p $1/tools/agbcc/lib
+		cp agbcc $1/tools/agbcc/bin/
+		cp old_agbcc $1/tools/agbcc/bin/
+		cp agbcc_arm $1/tools/agbcc/bin/
+		cp -R libc/include $1/tools/agbcc/ #drop include, because we don't want include/include
+		cp ginclude/* $1/tools/agbcc/include/
+		cp libgcc.a $1/tools/agbcc/lib/
+		cp libc.a $1/tools/agbcc/lib/
+	else
+		echo "Target directory does not exist. Did you mean to do \"./install.sh ../$1\"?"
+	fi
 else
     echo "Usage: install.sh PATH"
 fi
-- 
cgit v1.2.3