From 9f283fd1bbfcdeb2a53ca79cdd343f2726bcc2ee Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 19 Aug 2020 10:35:29 +0200
Subject: mirror tweaks

---
 .gitlab-ci.yml   |  1 +
 configure-mirror | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2a6202..e4cbad5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ stages:
 Build:
   stage: build
   script:
+    - ./configure-mirror
     - ./configure-podman
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - docker build --tag $CI_REGISTRY_IMAGE:latest .
diff --git a/configure-mirror b/configure-mirror
index 1b7ba55..85ea475 100755
--- a/configure-mirror
+++ b/configure-mirror
@@ -12,14 +12,16 @@ function set_baseurl() {
     fi
 
     for file in /etc/yum.repos.d/*.repo; do
-	grep -q -e "baseurl=$furl" || continue
+	if test ! -f "${file}.dist"; then
+	    cp -v "${file}" "${file}.dist"
+	fi
+	grep -q -e "baseurl=$furl" "${file}.dist" || continue
 	echo "# mirror: $furl -> $turl ($file)"
-	sed	-i.orig \
-		-e 's/^mirrorlist/#mirrorlist/' \
+	sed	-e 's/^mirrorlist/#mirrorlist/' \
 		-e 's/^#baseurl/baseurl/' \
 		-e "s|baseurl=${furl}|baseurl=${turl}|" \
-		"$file"
-	diff "${file}.orig" "$file"
+		< "${file}.dist" > "$file"
+	diff -u "${file}.dist" "$file"
     done
 }
 
-- 
cgit