1.0.86

3 files changed, 13 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d077bec28d98..798b0491a1b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ventoy-bin
 	pkgdesc = A new multiboot USB solution
-	pkgver = 1.0.85
+	pkgver = 1.0.86
 	pkgrel = 1
 	url = http://www.ventoy.net
 	install = ventoy.install
@@ -17,7 +17,7 @@ pkgbase = ventoy-bin
 	optdepends = polkit: run GUI from application menu
 	provides = ventoy
 	conflicts = ventoy
-	source = https://github.com/ventoy/Ventoy/releases/download/v1.0.85/ventoy-1.0.85-linux.tar.gz
+	source = https://github.com/ventoy/Ventoy/releases/download/v1.0.86/ventoy-1.0.86-linux.tar.gz
 	source = ventoy
 	source = ventoygui
 	source = ventoyweb
@@ -26,7 +26,7 @@ pkgbase = ventoy-bin
 	source = ventoy-extend-persistent
 	source = ventoy.desktop
 	source = sanitize.patch
-	sha256sums = 1234bf19ff83760184bf7f0ef9d9ecb000bc4b15814579256e951d7086a14420
+	sha256sums = 92cc57300ec63e516b3e2d6825af988389b2eaa306c15ae138bee92ebb9788d0
 	sha256sums = 1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000
 	sha256sums = 0215dbaf2095f5eeb2d40d9731268ed724790565e1dcaad67ffa4af80b5d8330
 	sha256sums = c3d4463a878a89d96e5f0bc4e1a43e48f27af5965bd4c977567695d7cf91fe5f
@@ -34,6 +34,6 @@ pkgbase = ventoy-bin
 	sha256sums = 51029745da197dded6e007aee3f30f7ea1aa6e898172a6ea176cc2f3a842d0ff
 	sha256sums = 00dec31721a052d5e6c928e3b38b870959bdb42188f34717898d99c0cef950df
 	sha256sums = 22225d48023806d0d15e059216ef4921de70cdb78348630be109fa9c669e2900
-	sha256sums = 36af9f05a5453273d322d4c250ab48a0d0d43d1f3851c9e07773bc6034756fea
+	sha256sums = 993ffb6daa6b61efe81e9e2922b82a0588737406525c37e0eed682ed500914f6
 
 pkgname = ventoy-bin
diff --git a/PKGBUILD b/PKGBUILD
index dff03853a91d..a3f9ab934ada 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: KokaKiwi <kokakiwi+aur@kokakiwi.net>
 
 pkgname=ventoy-bin
-pkgver=1.0.85
+pkgver=1.0.86
 pkgrel=1
 pkgdesc="A new multiboot USB solution"
 arch=('aarch64' 'i686' 'x86_64')
@@ -25,7 +25,7 @@ source=("https://github.com/ventoy/Ventoy/releases/download/v${pkgver}/${pkgname
         "${pkgname%-bin}-extend-persistent"
         "${pkgname%-bin}.desktop"
         'sanitize.patch')
-sha256sums=('1234bf19ff83760184bf7f0ef9d9ecb000bc4b15814579256e951d7086a14420'
+sha256sums=('92cc57300ec63e516b3e2d6825af988389b2eaa306c15ae138bee92ebb9788d0'
             '1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000'
             '0215dbaf2095f5eeb2d40d9731268ed724790565e1dcaad67ffa4af80b5d8330'
             'c3d4463a878a89d96e5f0bc4e1a43e48f27af5965bd4c977567695d7cf91fe5f'
@@ -33,7 +33,7 @@ sha256sums=('1234bf19ff83760184bf7f0ef9d9ecb000bc4b15814579256e951d7086a14420'
             '51029745da197dded6e007aee3f30f7ea1aa6e898172a6ea176cc2f3a842d0ff'
             '00dec31721a052d5e6c928e3b38b870959bdb42188f34717898d99c0cef950df'
             '22225d48023806d0d15e059216ef4921de70cdb78348630be109fa9c669e2900'
-            '36af9f05a5453273d322d4c250ab48a0d0d43d1f3851c9e07773bc6034756fea')
+            '993ffb6daa6b61efe81e9e2922b82a0588737406525c37e0eed682ed500914f6')
 
 prepare() {
   cd "${pkgname%-bin}-$pkgver"
diff --git a/sanitize.patch b/sanitize.patch
index 18e837e58c62..ed98be7aa78f 100644
--- a/sanitize.patch
+++ b/sanitize.patch
@@ -123,68 +123,17 @@ diff -rup old/Ventoy2Disk.sh new/Ventoy2Disk.sh
 -fi
 +./tool/VentoyWorker.sh $*
 diff -rup old/VentoyPlugson.sh new/VentoyPlugson.sh
---- VentoyPlugson.sh	2021-12-02 17:54:36.055868878 +0100
-+++ VentoyPlugson.sh	2021-12-02 18:04:40.919633986 +0100
-@@ -25,8 +19,6 @@ if echo $machine | egrep -q 'aarch64|arm
+--- VentoyPlugson.sh	2022-12-24 06:00:51.000000000 -0700
++++ VentoyPlugson.sh	2022-12-24 08:18:59.154268575 -0700
+@@ -34,8 +34,6 @@ if echo $machine | grep -E -q 'aarch64|a
      TOOLDIR=aarch64
- elif echo $machine | egrep -q 'x86_64|amd64'; then
+ elif echo $machine | grep -E -q 'x86_64|amd64'; then
      TOOLDIR=x86_64
--elif echo $machine | egrep -q 'mips64'; then
+-elif echo $machine | grep -E -q 'mips64'; then
 -    TOOLDIR=mips64el
- elif echo $machine | egrep -q 'i[3-6]86'; then
+ elif echo $machine | grep -E -q 'i[3-6]86'; then
      TOOLDIR=i386
  else
-@@ -35,38 +27,6 @@ else
- fi
- 
- 
--if ! [ -f "$OLDDIR/tool/plugson.tar.xz" ]; then
--    echo "Please run under the correct directory!" 
--    exit 1
--fi
--
--echo "############# VentoyPlugson $* [$TOOLDIR] ################" >> ./VentoyPlugson.log
--date >> ./VentoyPlugson.log
--
--echo "decompress tools" >> ./VentoyPlugson.log
--cd ./tool/$TOOLDIR
--
--ls *.xz > /dev/null 2>&1
--if [ $? -eq 0 ]; then
--    [ -f ./xzcat ] && chmod +x ./xzcat
--
--    for file in $(ls *.xz); do
--        echo "decompress $file" >> ./VentoyPlugson.log
--        xzcat $file > ${file%.xz}
--        [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
--        [ -f ./$file ] && rm -f ./$file
--    done
--fi
--
--cd ../../
--chmod +x -R ./tool/$TOOLDIR
--
--if ! [ -f "$OLDDIR/tool/$TOOLDIR/Plugson" ]; then
--    echo "$OLDDIR/tool/$TOOLDIR/Plugson does not exist!" 
--    exit 1
--fi
--
--
- PATH=./tool/$TOOLDIR:$PATH
- 
- HOST="127.0.0.1"
-@@ -208,11 +168,3 @@ if [ -f /proc/$wID/maps ]; then
- 
-     wait $wID
- fi
--
--
--if [ -n "$OLDDIR" ]; then 
--    CURDIR=$(pwd)
--    if [ "$CURDIR" != "$OLDDIR" ]; then
--        cd "$OLDDIR"
--    fi
--fi
 diff -rup old/VentoyWeb.sh new/VentoyWeb.sh
 --- VentoyWeb.sh	2021-12-02 16:58:51.885612627 +0100
 +++ VentoyWeb.sh	2021-12-02 17:04:43.437871014 +0100