changeset 742:aa3c1de1780a

vanilla: improve list and list-deps scripts
author David Demelier <markand@malikania.fr>
date Tue, 06 Aug 2019 20:59:00 +0200
parents ddd41f0f18ee
children a6ccd21107cb
files Scripts/lint-deps.sh Scripts/list.sh
diffstat 2 files changed, 14 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/Scripts/lint-deps.sh	Tue Aug 06 20:55:00 2019 +0200
+++ b/Scripts/lint-deps.sh	Tue Aug 06 20:59:00 2019 +0200
@@ -33,43 +33,24 @@
 	exit 1
 }
 
-scriptfile()
-{
-	echo $1/$(basename $1).sh
-}
-
-list()
-{
-	if [ $# -eq 0 ]; then
-		find $TOP -mindepth 2 -maxdepth 2 -type d | grep -v '\.hg'
-	else
-		file=$(scriptfile $1)
+check()
+{(
+	name=$(basename $1).sh
+	failed=0
 
-		if [ ! -f $file ]; then
-			echo "abort: invalid package specified '$1'" 1>&2
-			exit 1
-		fi
-
-		echo $1
-	fi
-}
-
-check()
-{
-	file=$(scriptfile $1)
-	failed=0
+	cd $TOP/$1
 
 	echo -n "checking dependencies for $1: "
 
 	# Reset PKGDEPENDS in case script is broken.
 	PKGDEPENDS=""
 
-	. $file
+	. ./$name
 
 	for d in $PKGDEPENDS; do
-		file=$TOP/$(scriptfile ${d%:*})
+		dep=$TOP/${d%:*}/$(basename ${d%:*}).sh
 
-		if [ ! -f $file ]; then
+		if [ ! -f $dep ]; then
 			# Only print "error" once.
 			if [ $failed -eq 0 ]; then
 				failed=1
@@ -83,13 +64,8 @@
 	if [ $failed -eq 0 ]; then
 		echo "ok"
 	fi
-}
+)}
 
-process()
-{
-	list $@ | while read pkg; do
-		check $pkg
-	done
-}
-
-process "$@"
+$TOP/Scripts/list.sh $1 | while read -r pkg; do
+	check $pkg
+done
--- a/Scripts/list.sh	Tue Aug 06 20:55:00 2019 +0200
+++ b/Scripts/list.sh	Tue Aug 06 20:59:00 2019 +0200
@@ -28,12 +28,13 @@
 
 scriptfile()
 {
-	echo $1/$(basename $1).sh
+	echo $TOP/$1/$(basename $1).sh
 }
 
 list()
 {(
 	if [ $# -eq 0 ]; then
+		cd $TOP
 		find -mindepth 2 -maxdepth 2 -type d | grep -v '\.hg' | sed -e 's|^./||'
 	else
 		file=$(scriptfile $1)