From d50ae24227bbbc434c0a2c4526b56206ae60fe05 Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Mon, 19 Jun 2023 17:09:16 +0530
Subject: [PATCH] refactor: Rename build scripts

---
 .github/workflows/build.yml                 | 2 +-
 .github/workflows/deploy.yml                | 2 +-
 build.sh => build-packages.sh               | 8 ++++----
 repo.sh => generate-dnf-repo.sh             | 0
 build-kernel-package.sh => kernel/kernel.sh | 0
 build-rpm.sh => rpm-build-in-mock.sh        | 0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename build.sh => build-packages.sh (72%)
 rename repo.sh => generate-dnf-repo.sh (100%)
 rename build-kernel-package.sh => kernel/kernel.sh (100%)
 rename build-rpm.sh => rpm-build-in-mock.sh (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 98b9f71..1ce901a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
         run: |
           echo "$RPM_SIGNING_KEY" > ./rpm_signing_key
           mkdir -p /tmp/output
-          docker run -t --privileged -v "$PWD":/repo -v /tmp/output:/output fedora:38 /bin/bash -c "/repo/build.sh"
+          docker run -t --privileged -v "$PWD":/repo -v /tmp/output:/output fedora:38 /bin/bash -c "/repo/build-packages.sh"
         env: 
           RPM_SIGNING_KEY: ${{ secrets.RPM_SIGNING_KEY }}
 
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9c1e90c..0e349d0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Build DNF Repo"
         run: |
           mkdir /tmp/repo
-          docker run -t -v /tmp/output:/output -v /tmp/rpm-repo:/rpm-repo -v $PWD:/repo fedora:38 /bin/bash -c "/repo/build-repo.sh"
+          docker run -t -v /tmp/output:/output -v /tmp/rpm-repo:/rpm-repo -v $PWD:/repo fedora:38 /bin/bash -c "/repo/generate-dnf-repo.sh"
           cp -r /tmp/rpm-repo ./deploy
 
       - name: "Upload DNF repo"
diff --git a/build.sh b/build-packages.sh
similarity index 72%
rename from build.sh
rename to build-packages.sh
index 561f7ac..7ef293b 100755
--- a/build.sh
+++ b/build-packages.sh
@@ -11,10 +11,10 @@ echo -e "%_signature gpg\n%_gpg_name T2Linux Fedora" > ~/.rpmmacros
 echo "=====BUILDING====="
 mkdir -p /output
 cd /repo
-/repo/build-rpm.sh t2linux-config
-/repo/build-rpm.sh t2linux-repo
-/repo/build-rpm.sh t2linux-audio
 
-/repo/scripts/kernel.sh
+/repo/rpm-build-in-mock.sh t2linux-config
+/repo/rpm-build-in-mock.sh t2linux-repo
+/repo/rpm-build-in-mock.sh t2linux-audio
+/repo/kernel/kernel.sh
 
 rpm --addsign /output/*.rpm
diff --git a/repo.sh b/generate-dnf-repo.sh
similarity index 100%
rename from repo.sh
rename to generate-dnf-repo.sh
diff --git a/build-kernel-package.sh b/kernel/kernel.sh
similarity index 100%
rename from build-kernel-package.sh
rename to kernel/kernel.sh
diff --git a/build-rpm.sh b/rpm-build-in-mock.sh
similarity index 100%
rename from build-rpm.sh
rename to rpm-build-in-mock.sh