From 0ba9fff282c639b8a4aaa5a5fd5fdbe4ba168a1d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 18 Dec 2024 12:09:00 +0100
Subject: tweaks

---
 buildfct |  2 +-
 getmock  |  2 +-
 mockit   | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/buildfct b/buildfct
index 7f5063e..a8c9476 100644
--- a/buildfct
+++ b/buildfct
@@ -379,7 +379,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 40 41 39
+  for i in 41 39 40
   do
     echo -n "$(date +%X) scl82 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 053c0f7..11ff924 100755
--- a/getmock
+++ b/getmock
@@ -700,8 +700,8 @@ elif [ $1 = scl71 ]; then
 elif [ $1 = scl84 ]; then
 	for dis in fc39 fc40 fc41 el8 el9 el10
 	do
-		getOneMock scl84${dis}a $opt
 		getOneMock scl84${dis}x $opt
+		getOneMock scl84${dis}a $opt
 	done
 
 elif [ $1 = scl83 ]; then
diff --git a/mockit b/mockit
index ef68fff..c4d9745 100755
--- a/mockit
+++ b/mockit
@@ -38,10 +38,16 @@ fi
 if [ "$1" == "--list" ]; then
 	echo "-- x86_64 queue: $($REDISCLI scard mockx) tasks --"
 	a=$($REDISCLI smembers mockx)
-	[ -n "$a" ] && $REDISCLI smembers mockx || ps -ef | grep mock/mock | grep -v grep
+	[ -n "$a" ] && $REDISCLI smembers mockx | \
+       sed -e 's/^.*-r/  /;s/rebuild/\t/' | sort || \
+       ps -ef | grep mock/mock | grep -v grep
+
 	echo -e "\n-- aarch64 queue: $($REDISCLI scard mocka) tasks --"
 	a=$($REDISCLI smembers mocka)
-	[ -n "$a" ] && $REDISCLI smembers mocka || ps -ef | ssh remi@ampere 'ps -ef | grep mock/mock | grep -v grep'
+	[ -n "$a" ] && $REDISCLI smembers mocka  | \
+      sed -e 's/^.*-r/  /;s/rebuild/\t/'| sort || \
+      ps -ef | ssh remi@ampere 'ps -ef | grep mock/mock | grep -v grep'
+
 	exit 0
 elif [ "$1" == "--clean" ]; then
 	$REDISCLI del mockx
-- 
cgit