From 53c05a1bbd3e8aca4b111f99faf45732fb258110 Mon Sep 17 00:00:00 2001
From: David Marec <DavidMarec@users.noreply.github.com>
Date: Sun, 5 Aug 2018 10:34:27 +0200
Subject: [PATCH] swich update

---
 update_stage0.sh | 27 +++++++++++++++++++--------
 update_stagep.sh | 13 +++++++------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/update_stage0.sh b/update_stage0.sh
index 2a299b5..40bb517 100755
--- a/update_stage0.sh
+++ b/update_stage0.sh
@@ -2,6 +2,7 @@
 
 usage() {
 	echo 'Usage: ...'
+	echo '-c	clean obj'
 	echo '-u	svn update'
 	echo '-j	jobs to be handled'
 	echo 'default to ' ${jarg}
@@ -11,11 +12,14 @@ usage() {
 parse() {
 	RED='\033[0;31m'
 	NC='\033[0m' # No Color
-	while getopts "uj:" option 
+	while getopts "cuj:" option 
 	do
 		case ${option} in
+			c)
+				CLEANING=1
+				;;
 			u)
-				update="1"
+				UPDATE=1
 				;;
 			j)
 				case ${OPTARG} in 
@@ -42,13 +46,20 @@ else
 	parse ${*} 
 fi
 
-[ ${update} ] && svn update /usr/src
+if [ ${UPDATE:=-0} -eq 1 ]; then 
+	echo "updating ..." 
+	svn update /usr/src
+	[ ${?} == 1 ] && exit 1
+fi
+
+
+if [ ${CLEANING:=-0} -eq 1 ]; then 
+	echo Cleaning
+	chflags -R noschg /usr/obj/* && sync && rm -rf /usr/obj && sync
+fi
 
-echo Cleaning
-chflags -R noschg /usr/obj/* && rm -rf /usr/obj
 echo building process on ${jarg} jobs
-cd /usr/src && \
-make -j${jarg} buildworld && make -j${jarg} kernel KERNCONF=PEPINS && \
-echo "Reboot the system."
+cd /usr/src && make -j${jarg} buildworld && make -j${jarg} kernel KERNCONF=PEPINS \
+	&& echo "Reboot the system."
 
 
diff --git a/update_stagep.sh b/update_stagep.sh
index ed637bd..2aa9dd1 100755
--- a/update_stagep.sh
+++ b/update_stagep.sh
@@ -15,7 +15,7 @@ parse() {
 	do
 		case ${option} in
 			u)
-				update="1"
+				UPDATE=1
 				;;
 			j)
 				case ${OPTARG} in 
@@ -42,14 +42,15 @@ else
 	parse ${*} 
 fi
 
-echo "Updating port Tree"
-
-[ ${update} ] && poudriere ports -p HEAD -u
+if [ ${UPDATE:=-0} -eq 1 ]; then
+	echo "Updating port Tree"
+	poudriere ports -p HEAD -u && portsnap auto
+fi
 
 echo "building lapinbilly"
 
-poudriere bulk -J ${jarg} -j lapinbilly -p HEAD -f /usr/local/etc/poudriere.d/port-list
+poudriere bulk -J ${jarg}:2   -j lapinbilly -p HEAD -f /usr/local/etc/poudriere.d/port-list
 
 echo "building llanura"
 
-poudriere bulk -J ${jarg} -j release11 -p HEAD -f /usr/local/etc/poudriere.d/port-list-llanura
+poudriere bulk -J ${jarg}:2   -j release11 -p HEAD -f /usr/local/etc/poudriere.d/port-list-llanura
-- 
2.44.0