Click here to go back to the commit logs for ventoy-bin.

Commit:

---

Hash: 3a53b1bc7f9ffa5a4cf90efe5a1481a9c24f9e53

Message: Cleanup PKGBUILD and launcher script.

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index af4d282..74f7d89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = ventoy
 	pkgdesc = A new multiboot USB solution
 	pkgver = 1.0.08
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.ventoy.net/
-	arch = x86_64
 	arch = i686
+	arch = x86_64
 	license = GPL3
 	depends = bash
 	depends = util-linux
-	provides = ventoy
-	conflicts = ventoy
 	source = https://github.com/ventoy/Ventoy/releases/download/v1.0.08/ventoy-1.0.08-linux.tar.gz
+	source = ventoy
 	sha512sums = 4b2e1e4bbe33cd08758bc7d7ca6a9518f3c4c8a4a6002c9b5c98e7b87e9453b2b3162c01bb2b751851a582b0e4e352dc042613f10a9e51c8672abc3c5f10f227
+	sha512sums = 714e97b24a0dca148e6579ee87697bed8b8d4339241973fb430b2a8a087e48458b6d8f3dc52535fd843045091735831b8adae81c503eeeb04998759017a03e9d
 
 pkgname = ventoy
 
diff --git a/PKGBUILD b/PKGBUILD
index 1fc3fc3..00dd36d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,33 @@
 # Maintainer: DuckSoft <realducksoft at gmail dot com>
+# Contributor: KokaKiwi <kokakiwi+aur@kokakiwi.net>
+
 pkgname=ventoy
-_pkgname=ventoy
-pkgrel=1
 pkgver=1.0.08
+pkgrel=2
 pkgdesc='A new multiboot USB solution'
-arch=('x86_64' 'i686')
-provides=(ventoy)
-conflicts=(ventoy)
-depends=('bash' 'util-linux')
-license=('GPL3')
 url='http://www.ventoy.net/'
-source=("https://github.com/ventoy/Ventoy/releases/download/v$pkgver/ventoy-$pkgver-linux.tar.gz")
-sha512sums=('4b2e1e4bbe33cd08758bc7d7ca6a9518f3c4c8a4a6002c9b5c98e7b87e9453b2b3162c01bb2b751851a582b0e4e352dc042613f10a9e51c8672abc3c5f10f227')
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('bash' 'util-linux')
+source=("https://github.com/ventoy/Ventoy/releases/download/v${pkgver}/ventoy-${pkgver}-linux.tar.gz"
+        'ventoy')
+sha512sums=('4b2e1e4bbe33cd08758bc7d7ca6a9518f3c4c8a4a6002c9b5c98e7b87e9453b2b3162c01bb2b751851a582b0e4e352dc042613f10a9e51c8672abc3c5f10f227'
+            '714e97b24a0dca148e6579ee87697bed8b8d4339241973fb430b2a8a087e48458b6d8f3dc52535fd843045091735831b8adae81c503eeeb04998759017a03e9d')
 
-# NOTE: Hard tabs are required here.
 prepare() {
-	msg2 'Generating ventoy launcher file...'
-	cat <<-MAGIC > ventoy
-	#!/bin/bash
-	cd /opt/ventoy
-	./Ventoy2Disk.sh "\$@"
-	MAGIC
-	
-	msg2 'Patching log.txt shit...'
-	cd $_pkgname-$pkgver
-	sed -i '/log\.txt/s/.*/true/' tool/ventoy_lib.sh 
+  cd "${pkgname}-${pkgver}"
+
+  msg2 "Patching log.txt stuff..."
+  sed -i '/log\.txt/s/.*/true/' tool/ventoy_lib.sh
 }
 
 package() {
-	cd $_pkgname-$pkgver
-	
-	mkdir -p "$pkgdir"/opt/ventoy/{boot,tool,ventoy} "$pkgdir"/usr/bin
-	
-	install -Dm644 boot/* -t "$pkgdir"/opt/ventoy/boot/
-	install -Dm644 ventoy/* -t "$pkgdir"/opt/ventoy/ventoy/
-	install -Dm755 tool/* -t "$pkgdir"/opt/ventoy/tool/
-	install -Dm755 Ventoy2Disk.sh -t "$pkgdir"/opt/ventoy/
-	
-	cd ..
-	install -Dm755 ventoy -t "$pkgdir"/usr/bin/
+  cd "${pkgname}-${pkgver}"
+
+  install -Dm644 boot/* -t "$pkgdir"/opt/ventoy/boot/
+  install -Dm644 ventoy/* -t "$pkgdir"/opt/ventoy/ventoy/
+  install -Dm755 tool/* -t "$pkgdir"/opt/ventoy/tool/
+  install -Dm755 Ventoy2Disk.sh -t "$pkgdir"/opt/ventoy/
+
+  install -Dm755 ../ventoy -t "$pkgdir"/usr/bin/
 }
diff --git a/ventoy b/ventoy
new file mode 100755
index 0000000..8a9aef7
--- /dev/null
+++ b/ventoy
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /opt/ventoy/Ventoy2Disk "$@"