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

Commit:

---

Hash: f145b854659b8f39450d9e14ef0d08b211174ef1

Message: update: ventoy-bin 1.0.30-1 upstream release

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 0c1092a..9198c5d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ventoy-bin
 	pkgdesc = A new multiboot USB solution (Binary)
-	pkgver = 1.0.29
+	pkgver = 1.0.30
 	pkgrel = 1
 	url = http://www.ventoy.net/
 	arch = i686
@@ -14,12 +14,12 @@ pkgbase = ventoy-bin
 	depends = lib32-glibc
 	provides = ventoy
 	conflicts = ventoy
-	source = https://github.com/ventoy/Ventoy/releases/download/v1.0.29/ventoy-1.0.29-linux.tar.gz
+	source = https://github.com/ventoy/Ventoy/releases/download/v1.0.30/ventoy-1.0.30-linux.tar.gz
 	source = ventoy
 	source = sanitize.patch
-	sha256sums = 7b9476c359ae8c4c49f37a3a79a183fb627febb6e499492c174db53c5c5cfa64
-	sha256sums = f9f333e21ec211318ab40018e0da3a44d8bae16e36dd6132e7891f8c9df52f1c
-	sha256sums = c61fe2f96357543233e8d8e3b4a81e26084af16ecf58314b268e4779fab37788
+	sha256sums = 0410043931953e7805fdb747f2a25c409ad0b6ed85807e222f30e995ab7352c4
+	sha256sums = 1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000
+	sha256sums = 88dd56d98cb98d18cb73a1ca142fbc12769d09343207c6546e934b39d6b760a3
 
 pkgname = ventoy-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index a9806cb..c58a457 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: KokaKiwi <kokakiwi+aur@kokakiwi.net>
 
 pkgname=ventoy-bin
-pkgver=1.0.29
+pkgver=1.0.30
 pkgrel=1
 pkgdesc='A new multiboot USB solution (Binary)'
 url='http://www.ventoy.net/'
@@ -14,13 +14,13 @@ provides=("${pkgname%-bin}")
 conflicts=("${pkgname%-bin}")
 source=("https://github.com/ventoy/Ventoy/releases/download/v${pkgver}/${pkgname%-bin}-${pkgver}-linux.tar.gz"
         "${pkgname%-bin}" 'sanitize.patch')
-sha256sums=('7b9476c359ae8c4c49f37a3a79a183fb627febb6e499492c174db53c5c5cfa64'
-            'f9f333e21ec211318ab40018e0da3a44d8bae16e36dd6132e7891f8c9df52f1c'
-            'c61fe2f96357543233e8d8e3b4a81e26084af16ecf58314b268e4779fab37788')
+sha256sums=('0410043931953e7805fdb747f2a25c409ad0b6ed85807e222f30e995ab7352c4'
+            '1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000'
+            '88dd56d98cb98d18cb73a1ca142fbc12769d09343207c6546e934b39d6b760a3')
 
 prepare() {
   msg2 "Decompress tools..."
-  cd "$srcdir/${pkgname%-bin}-${pkgver}/tool"
+  cd "$srcdir/${pkgname%-bin}-${pkgver}/tool/$CARCH"
   for file in *.xz; do
     xzcat $file > ${file%.xz}
     chmod +x ${file%.xz}
@@ -30,21 +30,23 @@ prepare() {
   rm -fv ./*.xz
 
   msg2 "Applying sanitize patch..."
-  cd ..
+  cd ../..
   patch --verbose -p0 < "$srcdir/sanitize.patch"
 
   msg2 "Cleaning up unused binaries..."
-  rm -fv tool/{mkextfatfs_{32,64},mount.exfat-fuse_{32,64},ash,hexdump,xzcat}
+  rm -fv tool/$CARCH/{mkextfatfs_{32,64},mount.exfat-fuse_{32,64},ash,hexdump,xzcat}
 }
 
 package() {
   cd "$srcdir/${pkgname%-bin}-${pkgver}"
 
   msg2 "Copying package files..."
-  install -Dm644 -vt "$pkgdir/opt/${pkgname%-bin}/boot/"            boot/*
-  install -Dm644 -vt "$pkgdir/opt/${pkgname%-bin}/${pkgname%-bin}/" "${pkgname%-bin}"/*
-  install -Dm755 -vt "$pkgdir/opt/${pkgname%-bin}/tool/"            tool/*
-  install -Dm755 -vt "$pkgdir/opt/${pkgname%-bin}/"                 *.sh
+  install -Dm644 -vt      "$pkgdir/opt/${pkgname%-bin}/boot/"            boot/*
+  install -Dm644 -vt      "$pkgdir/opt/${pkgname%-bin}/${pkgname%-bin}/" "${pkgname%-bin}"/*
+  install -Dm755 -vt      "$pkgdir/opt/${pkgname%-bin}/tool/"            tool/*.{cer,sh}
+  install -Dm755 -vt      "$pkgdir/opt/${pkgname%-bin}/tool/$CARCH/"     tool/$CARCH/*
+  install -Dm755 -vt      "$pkgdir/opt/${pkgname%-bin}/"                 *.sh
+  cp --no-preserve=o -avt "$pkgdir/opt/${pkgname%-bin}/"                 plugin
 
   msg2 "Linking system binaries..."
   ln -svf /usr/bin/xzcat            "$pkgdir/opt/${pkgname%-bin}/tool/"
diff --git a/sanitize.patch b/sanitize.patch
index 3bbbbd6..600e871 100644
--- a/sanitize.patch
+++ b/sanitize.patch
@@ -7,12 +7,10 @@ If you are interested to improve this patch, welcome to mail me.
 
 --- Ventoy2Disk.sh
 +++ Ventoy2Disk.sh
-@@ -18,46 +18,4 @@
+@@ -30,44 +18,4 @@
  echo '**********************************************'
  echo ''
  
--OLDDIR=$(pwd)
--PATH=./tool:$PATH
 -
 -if ! [ -f ./boot/boot.img ]; then
 -    if [ -d ./grub ]; then
@@ -23,30 +21,30 @@ If you are interested to improve this patch, welcome to mail me.
 -    exit 1
 -fi
 -
--echo "############# Ventoy2Disk $* ################" >> ./log.txt
+-echo "############# Ventoy2Disk $* [$TOOLDIR] ################" >> ./log.txt
 -date >> ./log.txt
 -
 -#decompress tool
--if [ -f ./tool/VentoyWorker.sh ]; then
+-if [ -f ./tool/$TOOLDIR/ash ]; then
 -    echo "no need to decompress tools" >> ./log.txt
 -else
--    cd tool
+-    cd ./tool/$TOOLDIR
 -    
--    if [ -f ./xzcat ]; then
--        chmod +x ./xzcat
--    fi
+-    [ -f ./xzcat ] && chmod +x ./xzcat
 -    
 -    for file in $(ls *.xz); do
 -        xzcat $file > ${file%.xz}
--        chmod +x ${file%.xz}
+-        [ -f ./$file ] && rm -f ./$file
 -    done
--    cd ../
+-    cd $OLDDIR
+-    
+-    chmod +x -R ./tool/$TOOLDIR
 -fi
 -
 -if [ -f /bin/bash ]; then
--    bash ./tool/VentoyWorker.sh $*
+-    /bin/bash ./tool/VentoyWorker.sh $*
 -else
--    ./tool/ash ./tool/VentoyWorker.sh $*
+-    ash ./tool/VentoyWorker.sh $*
 -fi
 -
 -if [ -n "$OLDDIR" ]; then 
@@ -57,18 +55,9 @@ If you are interested to improve this patch, welcome to mail me.
 +./tool/VentoyWorker.sh $*
 --- tool/ventoy_lib.sh
 +++ tool/ventoy_lib.sh
-@@ -37,7 +37,7 @@
- }
- 
- vtdebug() {
--    echo "$*" >> ./log.txt
-+    true
- }
+@@ -52,30 +52,6 @@
  
  check_tool_work_ok() {
-@@ -52,30 +52,6 @@
-         vtoyfat=vtoyfat_32
-     fi
      
 -    if echo 1 | hexdump > /dev/null; then
 -        vtdebug "hexdump test ok ..."
@@ -78,18 +67,18 @@ If you are interested to improve this patch, welcome to mail me.
 -        return
 -    fi
 -   
--    if ./tool/$mkexfatfs -V > /dev/null; then
--        vtdebug "$mkexfatfs test ok ..."
+-    if mkexfatfs -V > /dev/null; then
+-        vtdebug "mkexfatfs test ok ..."
 -    else
--        vtdebug "$mkexfatfs test fail ..."
+-        vtdebug "mkexfatfs test fail ..."
 -        ventoy_false
 -        return
 -    fi
 -    
--    if ./tool/$vtoyfat -T; then
--        vtdebug "$vtoyfat test ok ..."
+-    if vtoyfat -T; then
+-        vtdebug "vtoyfat test ok ..."
 -    else
--        vtdebug "$vtoyfat test fail ..."
+-        vtdebug "vtoyfat test fail ..."
 -        ventoy_false
 -        return
 -    fi
@@ -97,17 +86,3 @@ If you are interested to improve this patch, welcome to mail me.
      vtdebug "tool check success ..."
      ventoy_true
  }
-@@ -139,13 +115,6 @@
-         # fi
-     # fi
-     
--    # PART1_TYPE=$(dd if=$DISK bs=1 count=1 skip=450 status=none | hexdump -n1 -e  '1/1 "%02X"')
--    # if [ "$PART1_TYPE" != "07" ]; then
--        # vtdebug "part1 type is $PART2_TYPE not 07"
--        # ventoy_false
--        # return
--    # fi
--    
-     if [ -e /sys/class/block/${PART1#/dev/}/start ]; then
-         PART1_START=$(cat /sys/class/block/${PART1#/dev/}/start)
-     fi
diff --git a/ventoy b/ventoy
index 927356b..b6feeaa 100755
--- a/ventoy
+++ b/ventoy
@@ -1,5 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
-pushd /opt/ventoy || exit 1
-/opt/ventoy/Ventoy2Disk.sh "$@"
-popd || exit 1
+cd /opt/ventoy || exit 1
+exec ./Ventoy2Disk.sh "$@"