From 2e0295d50160c6ffb953bb15dbabbfeca0d72fe3 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton.feeds+github@gmail.com>
Date: Fri, 10 Jul 2020 08:46:00 +0000
Subject: Added a build script for my own sanity

---
 make.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100755 make.sh

(limited to 'make.sh')

diff --git a/make.sh b/make.sh
new file mode 100755
index 00000000..92559930
--- /dev/null
+++ b/make.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Description: Crude build/maker script for PKGBUILD dependencies and stuff.
+
+rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ archinstall-v2.0.3/ *.pkg.*.xz archinstall-*.tar.gz
+
+python3 setup.py sdist bdist_wheel
+nuitka3 --standalone --show-progress archinstall
+
+mv archinstall.dist archinstall-v2.0.3
+tar -czvf archinstall-v2.0.3.tar.gz archinstall-v2.0.3
+makepkg -f
+
+rm -rf archinstall.egg-info/ build/ dist/ src/ pkg/ archinstall.build/ archinstall-v2.0.3/ archinstall-*.tar.gz
+echo 'python3 -m twine upload dist/*'
-- 
cgit v1.2.3-70-g09d2


From 6ac2858816a0aad224c953cb70affcce6af5ea7f Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton.feeds+github@gmail.com>
Date: Fri, 10 Jul 2020 11:01:49 +0000
Subject: Fixed the build to include the examples in the right location.

---
 PKGBUILD | 2 ++
 make.sh  | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'make.sh')

diff --git a/PKGBUILD b/PKGBUILD
index e0f9c6c7..51959640 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,5 +22,7 @@ package() {
 
 	echo '#!/bin/bash' > "${pkgdir}/usr/bin/archinstall"
 	echo '(cd /var/lib/archinstall && exec ./archinstall)' >> "${pkgdir}/usr/bin/archinstall"
+
 	chmod +x "${pkgdir}/var/lib/archinstall/archinstall"
+	chmod +x "${pkgdir}/usr/bin/archinstall"
 }
diff --git a/make.sh b/make.sh
index 92559930..b79d52e5 100755
--- a/make.sh
+++ b/make.sh
@@ -3,12 +3,13 @@
 
 rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ archinstall-v2.0.3/ *.pkg.*.xz archinstall-*.tar.gz
 
-python3 setup.py sdist bdist_wheel
 nuitka3 --standalone --show-progress archinstall
-
+cp -r examples/ archinstall.dist/
 mv archinstall.dist archinstall-v2.0.3
 tar -czvf archinstall-v2.0.3.tar.gz archinstall-v2.0.3
 makepkg -f
 
-rm -rf archinstall.egg-info/ build/ dist/ src/ pkg/ archinstall.build/ archinstall-v2.0.3/ archinstall-*.tar.gz
+python3 setup.py sdist bdist_wheel
 echo 'python3 -m twine upload dist/*'
+
+rm -rf archinstall.egg-info/ build/ dist/ src/ pkg/ archinstall.build/ archinstall-v2.0.3/
-- 
cgit v1.2.3-70-g09d2


From 45268df2e7954b4c86f11b88610d80a3400c92bd Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton.feeds+github@gmail.com>
Date: Fri, 10 Jul 2020 11:06:41 +0000
Subject: Added the arch to the build

---
 PKGBUILD | 4 ++--
 make.sh  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'make.sh')

diff --git a/PKGBUILD b/PKGBUILD
index 51959640..ac760a11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,11 +9,11 @@ license=('GPLv3')
 provides=("${pkgname}")
 md5sums=('SKIP')
 arch=('x86_64')
-source=("${pkgname}-${pkgver}.tar.gz")
+source=("${pkgname}-${pkgver}-x86_64.tar.gz")
 #makedepends=('python>=3.8')
 
 package() {
-	cd "${pkgname}-${pkgver}"
+	cd "${pkgname}-${pkgver}-x86_64"
 
 	mkdir -p "${pkgdir}/var/lib/archinstall/"
 	mkdir -p "${pkgdir}/usr/bin"
diff --git a/make.sh b/make.sh
index b79d52e5..448e8c78 100755
--- a/make.sh
+++ b/make.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 # Description: Crude build/maker script for PKGBUILD dependencies and stuff.
 
-rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ archinstall-v2.0.3/ *.pkg.*.xz archinstall-*.tar.gz
+rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ archinstall-v2.0.3-x86_64/ *.pkg.*.xz archinstall-*.tar.gz
 
 nuitka3 --standalone --show-progress archinstall
 cp -r examples/ archinstall.dist/
-mv archinstall.dist archinstall-v2.0.3
-tar -czvf archinstall-v2.0.3.tar.gz archinstall-v2.0.3
+mv archinstall.dist archinstall-v2.0.3-x86_64
+tar -czvf archinstall-v2.0.3.tar.gz archinstall-v2.0.3-x86_64
 makepkg -f
 
 python3 setup.py sdist bdist_wheel
 echo 'python3 -m twine upload dist/*'
 
-rm -rf archinstall.egg-info/ build/ dist/ src/ pkg/ archinstall.build/ archinstall-v2.0.3/
+rm -rf archinstall.egg-info/ build/ dist/ src/ pkg/ archinstall.build/ archinstall-v2.0.3-x86_64/
-- 
cgit v1.2.3-70-g09d2