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 054ad95f7b923eedbe0f2f687ef40afcdcf2ceb1..07289be10d3e0f2ef1466f5ee3b970958b64463a 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 0000000000000000000000000000000000000000..fa252a502588d4a9c6521e57964dfc2e5440a537 --- /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