From 3a479a45d852bc816cdad9bde04e2802421387ff Mon Sep 17 00:00:00 2001
From: Ward from fusion-voyager-3 <hotrod.master@hotmail.com>
Date: Wed, 24 Jul 2024 14:00:23 +0300
Subject: [PATCH] fix main

---
 .github/workflows/build-canaryv3.yml   |  2 +-
 .github/workflows/build-nestv3.yml     |  2 +-
 .github/workflows/release-canaryv3.yml |  2 +-
 .github/workflows/release-nestv3.yml   |  2 +-
 scripts-v3/config => config            |  0
 main.sh                                | 10 ++++++++++
 mainv3.sh                              | 12 ------------
 {scripts-v3 => scripts}/build.sh       |  0
 {scripts-v3 => scripts}/config.sh      |  2 ++
 {scripts-v3 => scripts}/output.sh      |  0
 {scripts-v3 => scripts}/patch.sh       |  2 +-
 {scripts-v3 => scripts}/source.sh      |  0
 12 files changed, 17 insertions(+), 17 deletions(-)
 rename scripts-v3/config => config (100%)
 create mode 100755 main.sh
 delete mode 100755 mainv3.sh
 rename {scripts-v3 => scripts}/build.sh (100%)
 rename {scripts-v3 => scripts}/config.sh (98%)
 rename {scripts-v3 => scripts}/output.sh (100%)
 rename {scripts-v3 => scripts}/patch.sh (98%)
 rename {scripts-v3 => scripts}/source.sh (100%)

diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml
index 72adde7..6141d1a 100644
--- a/.github/workflows/build-canaryv3.yml
+++ b/.github/workflows/build-canaryv3.yml
@@ -31,4 +31,4 @@ jobs:
       run: apt-get update -y
 
     - name: Build Package
-      run: ./mainv3.sh
+      run: ./main.sh
diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml
index 3098818..2735ca3 100644
--- a/.github/workflows/build-nestv3.yml
+++ b/.github/workflows/build-nestv3.yml
@@ -31,4 +31,4 @@ jobs:
       run: apt-get update -y
 
     - name: Build Package
-      run: ./mainv3.sh
+      run: ./main.sh
diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml
index 3e837ff..a62eae8 100644
--- a/.github/workflows/release-canaryv3.yml
+++ b/.github/workflows/release-canaryv3.yml
@@ -31,7 +31,7 @@ jobs:
       run: apt-get update -y
 
     - name: Build Package
-      run: ./mainv3.sh
+      run: ./main.sh
 
     - name: Release Package
       run: ./release.sh
diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml
index bb9261e..f2cc7fd 100644
--- a/.github/workflows/release-nestv3.yml
+++ b/.github/workflows/release-nestv3.yml
@@ -31,7 +31,7 @@ jobs:
       run: apt-get update -y
 
     - name: Build Package
-      run: ./mainv3.sh
+      run: ./main.sh
 
     - name: Release Package
       run: ./release.sh
diff --git a/scripts-v3/config b/config
similarity index 100%
rename from scripts-v3/config
rename to config
diff --git a/main.sh b/main.sh
new file mode 100755
index 0000000..28ab3b5
--- /dev/null
+++ b/main.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+# Move the debs to output
+mkdir -p ./output
+
+. ./scripts/source.sh
+. ../scripts/patch.sh
+. ../scripts/config.sh
+. ../scripts/build.sh
+. ../scripts/output.sh
diff --git a/mainv3.sh b/mainv3.sh
deleted file mode 100755
index 9f1654e..0000000
--- a/mainv3.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-set -e
-
-# Move the debs to output
-mkdir -p ./output
-
-. ./scripts-v3/source.sh
-. ../scripts-v3/patch.sh
-. ../scripts-v3/config.sh
-. ../scripts-v3/build.sh
-. ../scripts-v3/output.sh
diff --git a/scripts-v3/build.sh b/scripts/build.sh
similarity index 100%
rename from scripts-v3/build.sh
rename to scripts/build.sh
diff --git a/scripts-v3/config.sh b/scripts/config.sh
similarity index 98%
rename from scripts-v3/config.sh
rename to scripts/config.sh
index 1ae33e7..b1719da 100755
--- a/scripts-v3/config.sh
+++ b/scripts/config.sh
@@ -2,6 +2,8 @@
 
 echo "Pika Kernel - Applying configuration"
 
+cp ../config .config
+
 scripts/config -k -d CONFIG_GENERIC_CPU
 scripts/config -k -e CONFIG_GENERIC_CPU3
 scripts/config -e CACHY
diff --git a/scripts-v3/output.sh b/scripts/output.sh
similarity index 100%
rename from scripts-v3/output.sh
rename to scripts/output.sh
diff --git a/scripts-v3/patch.sh b/scripts/patch.sh
similarity index 98%
rename from scripts-v3/patch.sh
rename to scripts/patch.sh
index fdfa7af..f30424b 100755
--- a/scripts-v3/patch.sh
+++ b/scripts/patch.sh
@@ -5,4 +5,4 @@ echo "Pika Kernel - Applying patches"
 if [ -f ../patches/series ]
 then
     for i in $(cat ../patches/series | grep -v '^#') ; do echo "Applying Patch: $i" && patch -Np1 -i ../patches/$i || bash -c "echo "Applying Patch $i Failed!" && exit 2"; done
-fi
\ No newline at end of file
+fi
diff --git a/scripts-v3/source.sh b/scripts/source.sh
similarity index 100%
rename from scripts-v3/source.sh
rename to scripts/source.sh