From 1a75e364e2ecdf415f514b506728be5e5bce0272 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Fri, 22 Sep 2023 12:56:19 -0700
Subject: [PATCH] move scripts to own dir
---
conv-to-stable.sh => scripts/conv-to-stable.sh | 0
sync-from-upstream => scripts/sync-from-upstream | 2 +-
scripts/sync-from-upstream-10 | 14 ++++++++++++++
update-comps => scripts/update-comps | 0
4 files changed, 15 insertions(+), 1 deletion(-)
rename conv-to-stable.sh => scripts/conv-to-stable.sh (100%)
rename sync-from-upstream => scripts/sync-from-upstream (84%)
create mode 100755 scripts/sync-from-upstream-10
rename update-comps => scripts/update-comps (100%)
diff --git a/conv-to-stable.sh b/scripts/conv-to-stable.sh
similarity index 100%
rename from conv-to-stable.sh
rename to scripts/conv-to-stable.sh
diff --git a/sync-from-upstream b/scripts/sync-from-upstream
similarity index 84%
rename from sync-from-upstream
rename to scripts/sync-from-upstream
index 054ad95..07289be 100755
--- a/sync-from-upstream
+++ b/scripts/sync-from-upstream
@@ -7,7 +7,7 @@ fi
echo "Fetching from upstream"
git fetch https://gitlab.com/redhat/centos-stream/release-engineering/comps.git main
echo "Formatting patch and applying..."
-git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's/centos-stream-9/rocky-9-lh/ ; s/centos-stream-10/rocky-10-lh/' | git apply
+git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's/centos-stream-9/rocky-9-lh/' | git apply
echo "!! DIFF OF CHANGES !!"
git --no-pager diff HEAD
diff --git a/scripts/sync-from-upstream-10 b/scripts/sync-from-upstream-10
new file mode 100755
index 0000000..fa252a5
--- /dev/null
+++ b/scripts/sync-from-upstream-10
@@ -0,0 +1,14 @@
+#!/bin/bash
+HOWMANY="-$1"
+if [ -z $1 ]; then
+ HOWMANY="-1"
+fi
+
+echo "Fetching from upstream"
+git fetch https://gitlab.com/redhat/centos-stream/release-engineering/comps.git c10s
+echo "Formatting patch and applying..."
+git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's/centos-stream-10/rocky-10-lh/' | git apply
+echo "!! DIFF OF CHANGES !!"
+git --no-pager diff HEAD
+
+echo "You may now commit and push."
diff --git a/update-comps b/scripts/update-comps
similarity index 100%
rename from update-comps
rename to scripts/update-comps
--
GitLab