changeset 1034:4b7330e49c3f

vanilla: update bulk/list scripts
author David Demelier <markand@malikania.fr>
date Fri, 30 Aug 2019 21:40:00 +0200
parents 4bb68497c97c
children 885652bb25c2
files Scripts/bulk.sh Scripts/list.sh
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Scripts/bulk.sh	Fri Aug 30 21:00:00 2019 +0200
+++ b/Scripts/bulk.sh	Fri Aug 30 21:40:00 2019 +0200
@@ -49,22 +49,22 @@
 {(
 	local name=$(basename $1)
 
+	# TODO: dependencies here.
+	echo -n "building $name: "
+
 	if [ $force -eq 1 ] || ! vpk info $name > /dev/null 2>&1; then
-		# TODO: dependencies here.
-		echo -n "building $name: "
 
 		cd $TOP/$pkg
 
 		if vpk build > $TMPDIR/fail.$name 2>&1; then
-			# TODO: make vpk add able to reinstall package.
-			rm -f /var/lib/vpk/$name
-			rm -f $TMPDIR/fail.$name
 			echo "ok"
-			vpk add -qt none /tmp/vpk/$name*pkg.txz
+			vpk add -qr /tmp/vpk/$name*pkg.txz
 		else
 			echo "failed"
 			return 1
 		fi
+	else
+		echo "not needed"
 	fi
 )}
 
@@ -133,7 +133,7 @@
 total=$(wc -l $TMPDIR/list | awk '{ print $1 }')
 current=1
 
-$TOP/Scripts/list.sh "$@" | while read -r pkg; do
+cat $TMPDIR/list | while read -r pkg; do
 	echo -n "($current/$total) "
 
 	if [ $missing -eq 1 ]; then
--- a/Scripts/list.sh	Fri Aug 30 21:00:00 2019 +0200
+++ b/Scripts/list.sh	Fri Aug 30 21:40:00 2019 +0200
@@ -28,7 +28,7 @@
 {(
 	if [ $# -eq 0 ]; then
 		cd $TOP
-		find -mindepth 2 -maxdepth 2 -type d | grep -v '\.hg' | sed -e 's|^./||'
+		find -mindepth 2 -maxdepth 2 -type d | grep -v '\.hg' | sed -e 's|^./||' | grep -v Templates
 	else
 		local file=$(scriptfile $1)