From 910f626f6712943264017ef1043d00bb3e1b2191 Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Thu, 2 Mar 2023 16:54:22 -0800
Subject: [PATCH] Refactor script locations

---
 .github/workflows/build-packages.yml            | 2 +-
 build.sh => build-packages.sh                   | 6 +++---
 build/t2linux-fedora.sh                         | 8 --------
 build-spec.sh => scripts/build-rpm-from-repo.sh | 0
 {build => scripts}/kernel.sh                    | 0
 {build => scripts}/python-blivet.sh             | 2 +-
 scripts/t2linux-fedora.sh                       | 8 ++++++++
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename build.sh => build-packages.sh (85%)
 delete mode 100755 build/t2linux-fedora.sh
 rename build-spec.sh => scripts/build-rpm-from-repo.sh (100%)
 rename {build => scripts}/kernel.sh (100%)
 rename {build => scripts}/python-blivet.sh (51%)
 create mode 100755 scripts/t2linux-fedora.sh

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 4257590..0c7ad3a 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -23,7 +23,7 @@ jobs:
         run: |
           mkdir -p ~/rpmbuild
           echo "$RPM_SIGNING_KEY" > ./rpm_signing_key
-          docker run -t -v "$PWD":/repo fedora:37 /bin/bash -c "/repo/build.sh"
+          docker run -t -v "$PWD":/repo fedora:37 /bin/bash -c "/repo/build-packages.sh"
         env: 
           RPM_SIGNING_KEY: ${{ secrets.RPM_SIGNING_KEY }}
 
diff --git a/build.sh b/build-packages.sh
similarity index 85%
rename from build.sh
rename to build-packages.sh
index 08633a2..e89b4f2 100755
--- a/build.sh
+++ b/build-packages.sh
@@ -10,9 +10,9 @@ echo -e "%_signature gpg\n%_gpg_name T2Linux Fedora" > ~/.rpmmacros
 
 echo "=====BUILDING====="
 rpmdev-setuptree
-/repo/build/python-blivet.sh
-/repo/build/t2linux-fedora.sh
-/repo/build/kernel.sh
+/repo/scripts/python-blivet.sh
+/repo/scripts/t2linux-fedora.sh
+/repo/scripts/kernel.sh
 rpm --addsign /root/rpmbuild/RPMS/x86_64/*.rpm
 
 # Copy artifacts to shared volume
diff --git a/build/t2linux-fedora.sh b/build/t2linux-fedora.sh
deleted file mode 100755
index 49f72f1..0000000
--- a/build/t2linux-fedora.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-cd /root/rpmbuild/SPECS
-
-echo "=====BUILDING====="
-cd /root/rpmbuild/SPECS
-/repo/build-spec.sh /repo t2linux-config
-/repo/build-spec.sh /repo t2linux-repo
diff --git a/build-spec.sh b/scripts/build-rpm-from-repo.sh
similarity index 100%
rename from build-spec.sh
rename to scripts/build-rpm-from-repo.sh
diff --git a/build/kernel.sh b/scripts/kernel.sh
similarity index 100%
rename from build/kernel.sh
rename to scripts/kernel.sh
diff --git a/build/python-blivet.sh b/scripts/python-blivet.sh
similarity index 51%
rename from build/python-blivet.sh
rename to scripts/python-blivet.sh
index b8977fe..c27b16f 100755
--- a/build/python-blivet.sh
+++ b/scripts/python-blivet.sh
@@ -4,4 +4,4 @@ cd /root/rpmbuild/SPECS
 
 echo "=====BUILDING====="
 cd /root/rpmbuild/SPECS
-/repo/build-spec.sh /repo python-blivet python-blivet-3.5.0-1.fc37
+/repo/scripts/build-rpm-from-repo.sh /repo python-blivet python-blivet-3.5.0-1.fc37
diff --git a/scripts/t2linux-fedora.sh b/scripts/t2linux-fedora.sh
new file mode 100755
index 0000000..1aa184c
--- /dev/null
+++ b/scripts/t2linux-fedora.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+cd /root/rpmbuild/SPECS
+
+echo "=====BUILDING====="
+cd /root/rpmbuild/SPECS
+/repo/scripts/build-rpm-from-repo.sh /repo t2linux-config
+/repo/scripts/build-rpm-from-repo.sh /repo t2linux-repo