From 122afc756d1c6cfbc86e4a859e0a08401f452d6d Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Wed, 3 Aug 2016 06:33:01 -0300
Subject: Change order arguments are validated to make more sense

---
 build/scripts/build_freebsd.sh   |  8 ++++----
 build/scripts/install_freebsd.sh | 12 +++++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'build')

diff --git a/build/scripts/build_freebsd.sh b/build/scripts/build_freebsd.sh
index dafbdd2..306db0d 100755
--- a/build/scripts/build_freebsd.sh
+++ b/build/scripts/build_freebsd.sh
@@ -74,16 +74,16 @@ while getopts s:o:WKh opt; do
 	esac
 done
 
-# Default obj dir to src/../obj
-: ${objdir=${srcdir}/../obj}
-
 [ -z "$srcdir" ] \
 	&& err "source directory is not defined"
 
 [ -e $srcdir -a ! -d $srcdir ] \
 	&& err "source path already exists and is not a directory"
 
-[ -n "$objdir" -a -e $objdir -a ! -d $objdir ] \
+# Default obj dir to src/../obj
+: ${objdir=${srcdir}/../obj}
+
+[ -n "$objdir" -a -e "$objdir" -a ! -d "$objdir" ] \
 	&& err "obj path already exists and is not a directory"
 
 for env_var in __MAKE_CONF SRCCONF SRC_ENV_CONF; do
diff --git a/build/scripts/install_freebsd.sh b/build/scripts/install_freebsd.sh
index 38f0671..48d92ab 100755
--- a/build/scripts/install_freebsd.sh
+++ b/build/scripts/install_freebsd.sh
@@ -93,9 +93,18 @@ while getopts s:d:o:iWKDhz opt; do
 	esac
 done
 
+[ -z "$srcdir" ] \
+	&& err "source directory is not defined"
+
+[ -e $srcdir -a ! -d $srcdir ] \
+	&& err "source path already exists and is not a directory"
+
 # Default obj dir to src/../obj
 : ${objdir=${srcdir}/../obj}
 
+[ -n "$objdir" -a -e "$objdir" -a ! -d "$objdir" ] \
+	&& err "obj path already exists and is not a directory"
+
 [ -z "$srcdir" ] \
 	&& err "source directory is not defined"
 
@@ -108,9 +117,6 @@ done
 [ -e $destdir -a ! -d $destdir ] \
 	&& err "destination path already exists and is not a directory"
 
-[ -n "$objdir" -a -e $objdir -a ! -d $objdir ] \
-	&& err "obj path already exists and is not a directory"
-
 for env_var in __MAKE_CONF SRCCONF SRC_ENV_CONF; do
 	eval "value=\${$env_var}"
 	[ -n "${value}" -a ! -f "${value}" ] \
-- 
cgit v1.1