refine packaging

reorganised symlinks to system binaries
patched upstream problematic uname usage
recovered output verbosity

3 files changed, 23 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be5f40583222..9f4e347d801a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ventoy-bin
 	pkgdesc = A new multiboot USB solution (Binary)
 	pkgver = 1.0.36
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.ventoy.net/
 	arch = i686
 	arch = x86_64
@@ -21,7 +21,7 @@ pkgbase = ventoy-bin
 	sha256sums = 4d3da8b7e1464e11e7325c5693fe92d6d086007f794c5de8c101e2661d494c58
 	sha256sums = 1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000
 	sha256sums = c3d4463a878a89d96e5f0bc4e1a43e48f27af5965bd4c977567695d7cf91fe5f
-	sha256sums = 30238ab336160993b7ddc3987b3bf1671ad981b5a82043199f174a05f275cf1a
+	sha256sums = 8c90f9625fdad2d792dc43fae4b601f239d2b5ee187d91d7d59d4f06ea6a427e
 
 pkgname = ventoy-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index c597241f6d8d..3591a1476124 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ventoy-bin
 pkgver=1.0.36
-pkgrel=4
+pkgrel=5
 pkgdesc='A new multiboot USB solution (Binary)'
 url='http://www.ventoy.net/'
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ source=("https://github.com/ventoy/Ventoy/releases/download/v${pkgver}/${pkgname
 sha256sums=('4d3da8b7e1464e11e7325c5693fe92d6d086007f794c5de8c101e2661d494c58'
             '1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000'
             'c3d4463a878a89d96e5f0bc4e1a43e48f27af5965bd4c977567695d7cf91fe5f'
-            '30238ab336160993b7ddc3987b3bf1671ad981b5a82043199f174a05f275cf1a')
+            '8c90f9625fdad2d792dc43fae4b601f239d2b5ee187d91d7d59d4f06ea6a427e')
 
 prepare() {
   msg2 "Decompress tools..."
@@ -36,7 +36,9 @@ prepare() {
   sed -i 's|log\.txt|/var/log/ventoy.log|g' WebUI/static/js/languages.js
 
   msg2 "Cleaning up unused binaries..."
-  rm -fv tool/$CARCH/{mkextfatfs_{32,64},mount.exfat-fuse_{32,64},ash,hexdump,xzcat}
+  for binary in xzcat hexdump mkexfatfs mount.exfat-fuse; do
+    rm -fv tool/$CARCH/$binary
+  done
 }
 
 package() {
@@ -51,13 +53,10 @@ package() {
   cp --no-preserve=o -avt "$pkgdir/opt/${pkgname%-bin}/"                 plugin WebUI
 
   msg2 "Linking system binaries..."
-  ln -svf /usr/bin/xzcat            "$pkgdir/opt/${pkgname%-bin}/tool/"
-  ln -svf /usr/bin/hexdump          "$pkgdir/opt/${pkgname%-bin}/tool/"
-  ln -svf /usr/bin/mkfs.exfat       "$pkgdir/opt/${pkgname%-bin}/tool/mkextfatfs_32"
-  ln -svf /usr/bin/mkfs.exfat       "$pkgdir/opt/${pkgname%-bin}/tool/mkextfatfs_64"
-  ln -svf /usr/bin/mount.exfat-fuse "$pkgdir/opt/${pkgname%-bin}/tool/mount.exfat-fuse_32"
-  ln -svf /usr/bin/mount.exfat-fuse "$pkgdir/opt/${pkgname%-bin}/tool/mount.exfat-fuse_64"
+  for binary in xzcat hexdump mkexfatfs mount.exfat-fuse; do
+    ln -svf /usr/bin/$binary "$pkgdir/opt/${pkgname%-bin}/tool/$CARCH/"
+  done
 
   msg2 "Creating /usr/bin entries..."
-  install -Dm755 "$srcdir/${pkgname%-bin}"{,web} -t "$pkgdir"/usr/bin/
+  install -Dm755 "$srcdir/${pkgname%-bin}"{,web} -vt "$pkgdir"/usr/bin/
 }
diff --git a/sanitize.patch b/sanitize.patch
index 2024eefd2dc9..71002a5f3fcd 100644
--- a/sanitize.patch
+++ b/sanitize.patch
@@ -136,6 +136,18 @@ diff -ru --color old/VentoyWeb.sh new/VentoyWeb.sh
  OLDDIR=$(pwd)
  
  if uname -a | egrep -q 'aarch64|arm64'; then
+@@ -17,9 +17,9 @@
+ 
+ OLDDIR=$(pwd)
+ 
+-if uname -a | egrep -q 'aarch64|arm64'; then
++if uname -m | egrep -q 'aarch64|arm64'; then
+     TOOLDIR=aarch64
+-elif uname -a | egrep -q 'x86_64|amd64'; then
++elif uname -m | egrep -q 'x86_64|amd64'; then
+     TOOLDIR=x86_64
+ else
+     TOOLDIR=i386
 @@ -82,8 +76,8 @@
      exit 1
  fi