From da65cc127921df83df950a2cb79afcab3550be92 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Jan 2025 12:31:30 +0100 Subject: minor tweaks --- getmock | 2 +- mkrepo | 2 +- mockit | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/getmock b/getmock index 11ff924..abe3460 100755 --- a/getmock +++ b/getmock @@ -759,7 +759,7 @@ elif [ $1 = allphp ]; then SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83 scl84" for i in $SCL $MOD do $0 $opt $i | tee $LOG - if grep -q '64\.rpm' $LOG && grep -q 'Aucun' $LOG + if grep -q '64\.rpm' $LOG && grep -q 'pas un dossier mock' $LOG then echo -en "\n> $i - [enter] >"; read rep fi diff --git a/mkrepo b/mkrepo index 0dfecfa..4e33f69 100755 --- a/mkrepo +++ b/mkrepo @@ -50,7 +50,7 @@ if [ "$dis" == "fedora" ]; then else # Enterprise if [ "$ver" -ge 10 ] - then echo "key 2021" + then echo "key 2024" GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4" elif [ "$ver" -ge 9 ] then echo "key 2021" diff --git a/mockit b/mockit index c4d9745..6578612 100755 --- a/mockit +++ b/mockit @@ -39,13 +39,13 @@ if [ "$1" == "--list" ]; then echo "-- x86_64 queue: $($REDISCLI scard mockx) tasks --" a=$($REDISCLI smembers mockx) [ -n "$a" ] && $REDISCLI smembers mockx | \ - sed -e 's/^.*-r/ /;s/rebuild/\t/' | sort || \ + sed -e 's/^.*-r / /;s/rebuild/\t/;s:/.*/::' | sort | head -n 25 || \ 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 | \ - sed -e 's/^.*-r/ /;s/rebuild/\t/'| sort || \ + sed -e 's/^.*-r / /;s/rebuild/\t/;s:/.*/::'| sort || \ ps -ef | ssh remi@ampere 'ps -ef | grep mock/mock | grep -v grep' exit 0 -- cgit