svn commit: r391119 - head/Mk/Scripts

[Baptiste Daroussin]

Author: bapt
Date: Wed Jul  1 20:08:26 2015
New Revision: 391119
URL: https://svnweb.freebsd.org/changeset/ports/391119

Log:
  Factorize the function to validate env
  
  Reviewed by:	antoine
  Differential Revision:	https://reviews.freebsd.org/D2966

Modified:
  head/Mk/Scripts/check-stagedir.sh
  head/Mk/Scripts/do-depends.sh
  head/Mk/Scripts/functions.sh

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Wed Jul  1 19:54:56 2015	(r391118)
+++ head/Mk/Scripts/check-stagedir.sh	Wed Jul  1 20:08:26 2015	(r391119)
@@ -224,20 +224,8 @@ case "$1" in
 esac
 
 # validate environment
-envfault=
-for i in STAGEDIR PREFIX LOCALBASE WRKDIR WRKSRC MTREE_FILE \
-    TMPPLIST PLIST_SUB_SED SCRIPTSDIR \
-    PORT_OPTIONS NO_PREFIX_RMDIR
-do
-    if ! ( eval ": \${${i}?}" ) 2>/dev/null ; then
-		envfault="${envfault}${envfault:+" "}${i}"
-    fi
-done
-if [ -n "$envfault" ] ; then
-	echo "Environment variables $envfault undefined. Aborting." \
-	| fmt >&2
-	exit 1
-fi
+validate_env STAGEDIR PREFIX LOCALBASE WRKDIR WRKSRC MTREE_FILE \
+    TMPPLIST PLIST_SUB_SED SCRIPTSDIR PORT_OPTIONS NO_PREFIX_RMDIR
 
 set -u
 

Modified: head/Mk/Scripts/do-depends.sh
==============================================================================
--- head/Mk/Scripts/do-depends.sh	Wed Jul  1 19:54:56 2015	(r391118)
+++ head/Mk/Scripts/do-depends.sh	Wed Jul  1 20:08:26 2015	(r391119)
@@ -7,22 +7,11 @@ set -e
 
 . ${dp_SCRIPTSDIR}/functions.sh
 
-envfault=
-for i in dp_RAWDEPENDS dp_DEPTYPE dp_DEPENDS_TARGET dp_DEPENDS_PRECLEAN \
+validate_env dp_RAWDEPENDS dp_DEPTYPE dp_DEPENDS_TARGET dp_DEPENDS_PRECLEAN \
 	dp_DEPENDS_CLEAN dp_DEPENDS_ARGS dp_USE_PACKAGE_DEPENDS \
 	dp_USE_PACKAGE_DEPENDS_ONLY dp_PKG_ADD dp_PKG_INFO dp_WRKDIR \
 	dp_PKGNAME dp_STRICT_DEPENDS dp_LOCALBASE dp_LIB_DIRS dp_SH \
 	dp_SCRIPTSDIR dp_PORTSDIR dp_MAKE
-do
-	if ! (eval ": \${${i}?}" ) >/dev/null; then
-		envfault="${envfault}${envfault:+" "}${i}"
-	fi
-done
-if [ -n "${envfault}" ]; then
-	echo "Environment variable ${envfault} undefined. Aborting." \
-		| fmt >&2
-	exit 1
-fi
 
 set -u
 

Modified: head/Mk/Scripts/functions.sh
==============================================================================
--- head/Mk/Scripts/functions.sh	Wed Jul  1 19:54:56 2015	(r391118)
+++ head/Mk/Scripts/functions.sh	Wed Jul  1 20:08:26 2015	(r391119)
@@ -139,3 +139,17 @@ parse_plist() {
 		esac
 	done
 }
+
+validate_env() {
+	local envfault
+	for i ; do
+		if ! (eval ": \${${i}?}" ) >/dev/null; then
+			envfault="${envfault}${envfault:+" "}${i}"
+		fi
+	done
+	if [ -n "${envfault}" ]; then
+		echo "Environment variable ${envfault} undefined. Aborting." \
+		| fmt >&2
+		exit 1
+	fi
+}