makedeb
makedeb
An utility to directly boot image files without reformating the USB
Click here to go back to the commit logs for ventoy-bin.
Hash: 1e62e9f47cba2212fd1a38297d0cdb3d60bbdb27
Message: 1.0.62
diff --git a/.SRCINFO b/.SRCINFO
index 72fe846..e856b57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ventoy-bin
pkgdesc = A new multiboot USB solution
- pkgver = 1.0.61
+ pkgver = 1.0.62
pkgrel = 1
url = http://www.ventoy.net
install = ventoy.install
@@ -20,21 +20,23 @@ pkgbase = ventoy-bin
optdepends = polkit: run GUI from application menu
provides = ventoy
conflicts = ventoy
- source = https://github.com/ventoy/Ventoy/releases/download/v1.0.61/ventoy-1.0.61-linux.tar.gz
+ source = https://github.com/ventoy/Ventoy/releases/download/v1.0.62/ventoy-1.0.62-linux.tar.gz
source = ventoy
source = ventoygui
+ source = ventoyplugson
source = ventoyweb
source = ventoy-persistent
source = ventoy-extend-persistent
source = ventoy.desktop
source = sanitize.patch
- sha256sums = 8a88555b294be3a4deb0e8ef78afa99f29a035c6c2605b4ffc45ac28fbefafc9
+ sha256sums = 073828200289bb07c9598ffc1ca82292ba62ec90a05ad34e3f489a292158f8dc
sha256sums = 1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000
sha256sums = cbe6f47007981ada5e27a092fac7620a926301a704b59186295552d9f64cb0e7
+ sha256sums = 1bbe66b52398be96402604562bddb5c9fbebfe345f0de184709e1c74086f2be6
sha256sums = c3d4463a878a89d96e5f0bc4e1a43e48f27af5965bd4c977567695d7cf91fe5f
sha256sums = 51029745da197dded6e007aee3f30f7ea1aa6e898172a6ea176cc2f3a842d0ff
sha256sums = 00dec31721a052d5e6c928e3b38b870959bdb42188f34717898d99c0cef950df
sha256sums = 22225d48023806d0d15e059216ef4921de70cdb78348630be109fa9c669e2900
- sha256sums = 6601732e91e61fddc5dfe4e2181906e533d57631060865df663dbc7b72bea453
+ sha256sums = 67c8c95719490376515719db41f84e812afb8d9f62b7a79ba8ede09afe6bf02c
pkgname = ventoy-bin
diff --git a/.gitignore b/.gitignore
index 04a1f25..a3e138b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
!.SRCINFO
!ventoy
!ventoygui
+!ventoyplugson
!ventoyweb
!ventoy-persistent
!ventoy-extend-persistent
diff --git a/PKGBUILD b/PKGBUILD
index 1afe65c..a2eecd5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: KokaKiwi <kokakiwi+aur@kokakiwi.net>
pkgname=ventoy-bin
-pkgver=1.0.61
+pkgver=1.0.62
pkgrel=1
pkgdesc="A new multiboot USB solution"
arch=('aarch64' 'i686' 'x86_64')
@@ -22,19 +22,21 @@ install="${pkgname%-bin}.install"
source=("https://github.com/ventoy/Ventoy/releases/download/v${pkgver}/${pkgname%-bin}-${pkgver}-linux.tar.gz"
"${pkgname%-bin}"
"${pkgname%-bin}gui"
+ "${pkgname%-bin}plugson"
"${pkgname%-bin}web"
"${pkgname%-bin}-persistent"
"${pkgname%-bin}-extend-persistent"
"${pkgname%-bin}.desktop"
'sanitize.patch')
-sha256sums=('8a88555b294be3a4deb0e8ef78afa99f29a035c6c2605b4ffc45ac28fbefafc9'
+sha256sums=('073828200289bb07c9598ffc1ca82292ba62ec90a05ad34e3f489a292158f8dc'
'1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000'
'cbe6f47007981ada5e27a092fac7620a926301a704b59186295552d9f64cb0e7'
+ '1bbe66b52398be96402604562bddb5c9fbebfe345f0de184709e1c74086f2be6'
'c3d4463a878a89d96e5f0bc4e1a43e48f27af5965bd4c977567695d7cf91fe5f'
'51029745da197dded6e007aee3f30f7ea1aa6e898172a6ea176cc2f3a842d0ff'
'00dec31721a052d5e6c928e3b38b870959bdb42188f34717898d99c0cef950df'
'22225d48023806d0d15e059216ef4921de70cdb78348630be109fa9c669e2900'
- '6601732e91e61fddc5dfe4e2181906e533d57631060865df663dbc7b72bea453')
+ '67c8c95719490376515719db41f84e812afb8d9f62b7a79ba8ede09afe6bf02c')
prepare() {
cd "${pkgname%-bin}-$pkgver"
@@ -70,7 +72,7 @@ package() {
cd "${pkgname%-bin}-$pkgver"
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,glade,json,sh}
+ install -Dm755 -vt "$pkgdir/opt/${pkgname%-bin}/tool/" tool/*.{cer,glade,json,sh,xz
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 WebUI
@@ -84,5 +86,5 @@ package() {
ln -svf /usr/bin/$binary "$pkgdir/opt/${pkgname%-bin}/tool/$CARCH/"
done
- install -Dm755 "$srcdir/${pkgname%-bin}"{,gui,web,-{,extend-}persistent} -vt "$pkgdir"/usr/bin/
+ install -Dm755 "$srcdir/${pkgname%-bin}"{,gui,plugson,web,-{,extend-}persistent} -vt "$pkgdir"/usr/bin/
}
diff --git a/sanitize.patch b/sanitize.patch
index 0edadd2..78c7e8d 100644
--- a/sanitize.patch
+++ b/sanitize.patch
@@ -5,9 +5,9 @@ Let me do some optimisations.
If you are interested to improve this patch, welcome to mail me.
-diff -ru old/tool/ventoy_lib.sh new/tool/ventoy_lib.sh
---- tool/ventoy_lib.sh 2021-03-06 14:54:04.163817366 +0100
-+++ tool/ventoy_lib.sh 2021-03-06 14:56:07.053667242 +0100
+diff --unified --recursive --text ventoy-1.0.62.orig/tool/ventoy_lib.sh ventoy-1.0.62.new/tool/ventoy_lib.sh
+--- ventoy-1.0.62.orig/tool/ventoy_lib.sh 2021-12-02 04:53:22.000000000 -0700
++++ ventoy-1.0.62.new/tool/ventoy_lib.sh 2021-12-02 09:09:33.339996473 -0700
@@ -29,7 +29,7 @@
}
@@ -48,7 +48,7 @@ diff -ru old/tool/ventoy_lib.sh new/tool/ventoy_lib.sh
vtdebug "tool check success ..."
ventoy_true
}
-@@ -264,7 +240,7 @@
+@@ -269,7 +245,7 @@
else
vtdebug "format disk by fdisk ..."
@@ -57,9 +57,10 @@ diff -ru old/tool/ventoy_lib.sh new/tool/ventoy_lib.sh
o
n
p
-diff -ru old/tool/VentoyWorker.sh new/tool/VentoyWorker.sh
---- tool/VentoyWorker.sh 2021-03-06 14:53:26.603866863 +0100
-+++ tool/VentoyWorker.sh 2021-03-06 14:55:52.493675465 +0100
+Only in ventoy-1.0.62.new/tool: ventoy_lib.sh.orig
+diff --unified --recursive --text ventoy-1.0.62.orig/tool/VentoyWorker.sh ventoy-1.0.62.new/tool/VentoyWorker.sh
+--- ventoy-1.0.62.orig/tool/VentoyWorker.sh 2021-12-02 04:53:22.000000000 -0700
++++ ventoy-1.0.62.new/tool/VentoyWorker.sh 2021-12-02 09:09:33.339996473 -0700
@@ -99,7 +99,7 @@
if check_tool_work_ok; then
vtdebug "check tool work ok"
@@ -69,10 +70,10 @@ diff -ru old/tool/VentoyWorker.sh new/tool/VentoyWorker.sh
exit 1
fi
-diff -ru old/Ventoy2Disk.sh new/Ventoy2Disk.sh
---- Ventoy2Disk.sh 2021-03-06 14:52:52.703911700 +0100
-+++ Ventoy2Disk.sh 2021-03-06 14:55:45.943684011 +0100
-@@ -34,46 +34,4 @@
+diff --unified --recursive --text ventoy-1.0.62.orig/Ventoy2Disk.sh ventoy-1.0.62.new/Ventoy2Disk.sh
+--- ventoy-1.0.62.orig/Ventoy2Disk.sh 2021-12-02 04:53:22.000000000 -0700
++++ ventoy-1.0.62.new/Ventoy2Disk.sh 2021-12-02 09:11:09.285825629 -0700
+@@ -32,48 +32,4 @@
echo '**********************************************'
echo ''
@@ -90,23 +91,25 @@ diff -ru old/Ventoy2Disk.sh new/Ventoy2Disk.sh
-date >> ./log.txt
-
-#decompress tool
--if [ -f ./tool/$TOOLDIR/ash ]; then
-- echo "no need to decompress tools" >> ./log.txt
--else
-- cd ./tool/$TOOLDIR
--
+-echo "decompress tools" >> ./log.txt
+-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" >> ./log.txt
- xzcat $file > ${file%.xz}
- [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
- [ -f ./$file ] && rm -f ./$file
- done
-- cd ../../
--
-- chmod +x -R ./tool/$TOOLDIR
-fi
-
+-cd ../../
+-chmod +x -R ./tool/$TOOLDIR
+-
+-
-if [ -f /bin/bash ]; then
- /bin/bash ./tool/VentoyWorker.sh $*
-else
@@ -120,9 +123,9 @@ diff -ru old/Ventoy2Disk.sh new/Ventoy2Disk.sh
- fi
-fi
+./tool/VentoyWorker.sh $*
-diff -ru old/VentoyWeb.sh new/VentoyWeb.sh
---- VentoyWeb.sh 2021-03-06 14:54:25.383789486 +0100
-+++ VentoyWeb.sh 2021-03-06 14:56:01.253668661 +0100
+diff --unified --recursive --text ventoy-1.0.62.orig/VentoyWeb.sh ventoy-1.0.62.new/VentoyWeb.sh
+--- ventoy-1.0.62.orig/VentoyWeb.sh 2021-12-02 04:53:22.000000000 -0700
++++ ventoy-1.0.62.new/VentoyWeb.sh 2021-12-02 09:09:33.339996473 -0700
@@ -15,12 +15,6 @@
echo ""
}
diff --git a/ventoyplugson b/ventoyplugson
new file mode 100644
index 0000000..f1e7b2d
--- /dev/null
+++ b/ventoyplugson
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /opt/ventoy || exit 1
+exec ./VentoyPlugson.sh "$@"