From 1b1280df1ca99cf6cddc10673cfa4007b6c494ec Mon Sep 17 00:00:00 2001 From: Arthur Bols Date: Thu, 11 Jul 2024 15:28:21 +0200 Subject: [PATCH] Fix removing old versions --- run.sh | 4 ++-- run.sh.bak | 53 ----------------------------------------------------- 2 files changed, 2 insertions(+), 55 deletions(-) delete mode 100755 run.sh.bak diff --git a/run.sh b/run.sh index 97e99c9..c7f1364 100755 --- a/run.sh +++ b/run.sh @@ -11,7 +11,7 @@ ARCHES="${ARCHES:1}" for i in $FILES; do for a in "${ARCH[@]}"; do - ls $i-[0-9]*$a.rpm -rv 2> /dev/null | awk 'NR>1' | xargs -d '\n' -r rm -v -- + ls $i[-_][0-9]*$a.rpm -rv 2> /dev/null | awk 'NR>1' | xargs -d '\n' -r rm -v -- done done @@ -23,4 +23,4 @@ set +f createrepo -q /data --update -echo 'Finished' \ No newline at end of file +echo 'Finished' diff --git a/run.sh.bak b/run.sh.bak deleted file mode 100755 index ad2e451..0000000 --- a/run.sh.bak +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -VERSION=30 -ARCH="x86_64" -REPO_DIR=/rpmfusion - -MIRROR=( - "rsync://download1.rpmfusion.org/rpmfusion/" -) - - -for ((i=0; i<${#MIRROR[@]}; i++)); do - rsync --progress -amH --numeric-ids --delete --delete-delay --delay-updates \ - --exclude='*/drpms' \ - --exclude='*/images' \ - --exclude='*/Docker' \ - --exclude='*/CloudImages' \ - --exclude='*/debug' \ - --exclude='*/iso' \ - --exclude='*/development'\ - --exclude='*/testing'\ - --exclude='*/tainted'\ - --exclude='*/rpi'\ - --exclude='*/steam'\ - --exclude='*/nvidia-driver'\ - --include="**/${VERSION}/**${ARCH}/***" \ - --include='*/' --exclude='*' \ - "${MIRROR[i]}" "${REPO_DIR}" -done - -find "${REPO_DIR}" -name "*comps-*.xml" -exec sh -c 'cp -av {} "$(dirname {})/../comps.xml"' \; - - -for i in $(find "${REPO_DIR}" -type d -name 'repodata' -exec dirname '{}' \;); do - createrepo --update --database --deltas -c /cache/rpmfusion -g comps.xml "$i" -done - - -echo 'Cleaning up Claque...' - -cd /data/Packages -FILES="$(rpm -qp --queryformat '%{NAME}\n' *.rpm 2> /dev/null | uniq)" -ARCH=('x86_64' 'i686' 'noarch' 'i386') - -for i in $FILES; do - for a in "${ARCH[@]}"; do - ls $i*$a.rpm -rv 2> /dev/null | awk 'NR>1' | xargs -d '\n' -r rm -v -- - done -done - -dnf download --refresh --best --destdir /data/Packages/ $PACKAGES - -createrepo /data --update --verbose --database --deltas -c /cache/claque