diff options
| -rw-r--r-- | buildfct | 2 | ||||
| -rwxr-xr-x | getmock | 2 | ||||
| -rwxr-xr-x | mockit | 10 |
3 files changed, 10 insertions, 4 deletions
@@ -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 !" @@ -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 @@ -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 |