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: f30f412fdb88ce46861d5581fb7ecbe9d0fa14f6
Message: Initial mpr release
diff --git a/.SRCINFO b/.SRCINFO
index e530b2c..aaaf534 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,31 @@
-pkgbase = ventoy-bin
- pkgdesc = A new bootable USB solution
- pkgver = 1.0.96
- pkgrel = 1
- url = http://www.ventoy.net
- install = ventoy.install
- arch = aarch64
- arch = i686
- arch = x86_64
- license = GPL3
- depends = bash
- depends = util-linux
- depends = xz
- depends = dosfstools
- optdepends = gtk3: GTK3 GUI
- optdepends = qt5-base: Qt5 GUI
- optdepends = polkit: run GUI from application menu
- provides = ventoy
- conflicts = ventoy
- source = https://github.com/ventoy/Ventoy/releases/download/v1.0.96/ventoy-1.0.96-linux.tar.gz
- source = ventoy
- source = ventoygui
- source = ventoyweb
- source = ventoyplugson
- source = ventoy-persistent
- source = ventoy-extend-persistent
- source = ventoy.desktop
- source = sanitize.patch
- sha256sums = 794a717c9434bb76e90174d408a94c3bf562c0a701239f5814a277c46cd275c8
- sha256sums = 1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000
- sha256sums = 0215dbaf2095f5eeb2d40d9731268ed724790565e1dcaad67ffa4af80b5d8330
- sha256sums = c3d4463a878a89d96e5f0bc4e1a43e48f27af5965bd4c977567695d7cf91fe5f
- sha256sums = 1bbe66b52398be96402604562bddb5c9fbebfe345f0de184709e1c74086f2be6
- sha256sums = 51029745da197dded6e007aee3f30f7ea1aa6e898172a6ea176cc2f3a842d0ff
- sha256sums = 00dec31721a052d5e6c928e3b38b870959bdb42188f34717898d99c0cef950df
- sha256sums = 22225d48023806d0d15e059216ef4921de70cdb78348630be109fa9c669e2900
- sha256sums = 993ffb6daa6b61efe81e9e2922b82a0588737406525c37e0eed682ed500914f6
-
+generated-by = makedeb
pkgname = ventoy-bin
+pkgbase = ventoy-bin
+pkgdesc = An utility to directly boot image files without reformating the USB
+pkgrel = 0
+pkgver = 1.0.96
+url = http://www.ventoy.net
+arch = amd64
+arch = arm64
+arch = i386
+conflicts = ventoy
+depends = bash
+depends = util-linux
+depends = xz-utils
+depends = dosfstools
+license = GPL3
+optdepends = libgtk-3-0: GTK3 GUI
+optdepends = libqt5gui5: Qt5 GUI
+optdepends = pkexec: run GUI from application menu
+provides = ventoy
+source = https://github.com/ventoy/Ventoy/releases/download/v1.0.96/ventoy-1.0.96-linux.tar.gz
+source = ventoy-wrapper.sh
+source = ventoy.desktop
+source = sanitize.patch
+sha256sums = 794a717c9434bb76e90174d408a94c3bf562c0a701239f5814a277c46cd275c8
+sha256sums = b41f1bb0ba96c6484fd64aefbb63a106b756f08667e19bde93ddc28d7de973a3
+sha256sums = 22225d48023806d0d15e059216ef4921de70cdb78348630be109fa9c669e2900
+sha256sums = 993ffb6daa6b61efe81e9e2922b82a0588737406525c37e0eed682ed500914f6
+optdepends = libgtk-3-0: GTK3 GUI
+optdepends = libqt5gui5: Qt5 GUI
+optdepends = pkexec: run GUI from application menu
diff --git a/.gitignore b/.gitignore
index a3e138b..faf216a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,4 @@
-# Ignore everything
-*
-
-# But not these files...
-!.gitignore
-!PKGBUILD
-!.SRCINFO
-!ventoy
-!ventoygui
-!ventoyplugson
-!ventoyweb
-!ventoy-persistent
-!ventoy-extend-persistent
-!ventoy.desktop
-!sanitize.patch
-!ventoy.install
+pkg/
+src/
+*.deb
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index d42a17c..fd9e9b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,28 @@
-# Maintainer: DuckSoft <realducksoft at gmail dot com>
-# Co-Maintainer: Mark Wagie <mark dot wagie at proton dot me>
-# Contributor: KokaKiwi <kokakiwi+aur@kokakiwi.net>
+# Maintainer: exponential <echo ZXhwb25lbnRpYWxtYXRyaXhAcHJvdG9ubWFpbC5jb20K | base64 -d>
+# Contributor: DuckSoft (AUR)<realducksoft at gmail dot com>
+# Contributor: Mark Wagie (AUR)<mark dot wagie at proton dot me>
+# Contributor: KokaKiwi (AUR)<kokakiwi+aur@kokakiwi.net>
pkgname=ventoy-bin
pkgver=1.0.96
-pkgrel=1
-pkgdesc="A new bootable USB solution"
-arch=('aarch64' 'i686' 'x86_64')
+pkgrel=0
+pkgdesc="An utility to directly boot image files without reformating the USB"
+_ARCH="$(uname -m)"
+arch=("amd64" "arm64" "i386")
url="http://www.ventoy.net"
license=('GPL3')
-depends=('bash' 'util-linux' 'xz' 'dosfstools')
-optdepends=('gtk3: GTK3 GUI'
- 'qt5-base: Qt5 GUI'
- 'polkit: run GUI from application menu')
+depends=('bash' 'util-linux' 'xz-utils' 'dosfstools')
+optdepends=('libgtk-3-0: GTK3 GUI'
+ 'libqt5gui5: Qt5 GUI'
+ 'pkexec: run GUI from application menu')
provides=("${pkgname%-bin}")
conflicts=("${pkgname%-bin}")
-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}web"
- "${pkgname%-bin}plugson"
- "${pkgname%-bin}-persistent"
- "${pkgname%-bin}-extend-persistent"
+ "${pkgname%-bin}-wrapper.sh"
"${pkgname%-bin}.desktop"
'sanitize.patch')
sha256sums=('794a717c9434bb76e90174d408a94c3bf562c0a701239f5814a277c46cd275c8'
- '1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000'
- '0215dbaf2095f5eeb2d40d9731268ed724790565e1dcaad67ffa4af80b5d8330'
- 'c3d4463a878a89d96e5f0bc4e1a43e48f27af5965bd4c977567695d7cf91fe5f'
- '1bbe66b52398be96402604562bddb5c9fbebfe345f0de184709e1c74086f2be6'
- '51029745da197dded6e007aee3f30f7ea1aa6e898172a6ea176cc2f3a842d0ff'
- '00dec31721a052d5e6c928e3b38b870959bdb42188f34717898d99c0cef950df'
+ 'b41f1bb0ba96c6484fd64aefbb63a106b756f08667e19bde93ddc28d7de973a3'
'22225d48023806d0d15e059216ef4921de70cdb78348630be109fa9c669e2900'
'993ffb6daa6b61efe81e9e2922b82a0588737406525c37e0eed682ed500914f6')
@@ -39,7 +30,7 @@ prepare() {
cd "${pkgname%-bin}-$pkgver"
# Decompress tools
- pushd tool/$CARCH
+ pushd tool/$_ARCH
for file in *.xz; do
xzcat $file > ${file%.xz}
chmod +x ${file%.xz}
@@ -52,8 +43,8 @@ prepare() {
# Apply sanitize patch
patch --verbose -p0 < "$srcdir/sanitize.patch"
- # Log location
- sed -i 's|log\.txt|/var/log/ventoy.log|g' WebUI/static/js/languages.js tool/languages.json
+ # WebUI Log location
+ #sed -i 's|log\.txt|/var/log/ventoy.log|g' WebUI/static/js/languages.js tool/languages.json
# Non-POSIX compliant scripts
sed -i 's|bin/sh|usr/bin/env bash|g' tool/{ventoy_lib.sh,VentoyWorker.sh}
@@ -61,32 +52,49 @@ prepare() {
# Clean up unused binaries
# Preserving mkexfatfs and mount.exfat-fuse because exfatprogs is incompatible
for binary in xzcat hexdump; do
- rm -fv tool/$CARCH/$binary
+ rm -fv tool/$_ARCH/$binary
done
}
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,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
+ _PREFIX="/usr/libexec/${pkgname%-bin}"
+ _SHAREPREFIX="/usr/share/${pkgname%-bin}"
- install -Dm755 "VentoyGUI.$CARCH" -vt "$pkgdir/opt/${pkgname%-bin}"
- install -Dm644 WebUI/static/img/VentoyLogo.png -v "$pkgdir/usr/share/pixmaps/${pkgname%-bin}.png"
+ install -Dm644 -vt "$pkgdir${_SHAREPREFIX}/boot/" boot/*
+ install -Dm644 -vt "$pkgdir${_SHAREPREFIX}/${pkgname%-bin}/" "${pkgname%-bin}"/*
+ install -Dm755 -vt "$pkgdir${_SHAREPREFIX}/tool/" tool/*.{cer,glade,json,xz}
+ install -Dm755 -vt "$pkgdir${_PREFIX}/tool/" tool/*.sh
+ install -Dm755 -vt "$pkgdir${_PREFIX}/tool/$_ARCH/" tool/$_ARCH/*
+ install -Dm755 -vt "$pkgdir${_PREFIX}/" *.sh
+ cp --no-preserve=o -avt "$pkgdir${_SHAREPREFIX}/" plugin WebUI
+
+ install -Dm755 "VentoyGUI.$_ARCH" -v "$pkgdir${_PREFIX}/VentoyGUI"
+ install -dm755 "$pkgdir/usr/share/pixmaps"
+ ln -s "${_SHAREPREFIX}/WebUI/static/img/VentoyLogo.png" "$pkgdir/usr/share/pixmaps/${pkgname%-bin}.png"
install -Dm644 "$srcdir/${pkgname%-bin}.desktop" -vt "$pkgdir/usr/share/applications"
# Link system binaries
for binary in xzcat hexdump; do
- ln -svf /usr/bin/$binary "$pkgdir/opt/${pkgname%-bin}/tool/$CARCH/"
+ ln -svf /usr/bin/$binary "$pkgdir${_PREFIX}/tool/$_ARCH/"
done
- install -Dm755 "$srcdir/${pkgname%-bin}"{,gui,web,plugson,-{,extend-}persistent} -vt "$pkgdir"/usr/bin/
+ # launchers
+ install -dm755 "$pkgdir"/usr/bin/
+ install -m755 "$srcdir/${pkgname%-bin}-wrapper.sh" -vt "$pkgdir${_PREFIX}/"
+ ln -s "${_PREFIX}/${pkgname%-bin}-wrapper.sh" "$pkgdir/usr/bin/${pkgname%-bin}"2disk
+ ln -s "${_PREFIX}/${pkgname%-bin}-wrapper.sh" "$pkgdir/usr/bin/${pkgname%-bin}"gui
+ ln -s "${_PREFIX}/${pkgname%-bin}-wrapper.sh" "$pkgdir/usr/bin/${pkgname%-bin}"web
+ ln -s "${_PREFIX}/${pkgname%-bin}-wrapper.sh" "$pkgdir/usr/bin/${pkgname%-bin}"plugson
+ ln -s "${_PREFIX}/${pkgname%-bin}-wrapper.sh" "$pkgdir/usr/bin/${pkgname%-bin}"-extend-persistent
+ ln -s "${_PREFIX}/${pkgname%-bin}-wrapper.sh" "$pkgdir/usr/bin/${pkgname%-bin}"-create-persistent
+ ln -s "${_PREFIX}/${pkgname%-bin}-wrapper.sh" "$pkgdir/usr/bin/${pkgname%-bin}"vlink
# Remove Gtk 2 files
- if [ $CARCH == "x86_64" ]; then
- rm "$pkgdir/opt/${pkgname%-bin}/tool/$CARCH/Ventoy2Disk.gtk2"
+ if [ $_ARCH == "x86_64" ]; then
+ rm "$pkgdir${_PREFIX}/tool/$_ARCH/Ventoy2Disk.gtk2"
fi
+
+ # readme
+ install -Dm644 "$srcdir/${pkgname%-bin}-$pkgver/README" "$pkgdir/usr/share/doc/${pkgname%-bin}/readme"
}
diff --git a/ventoy b/ventoy
deleted file mode 100755
index b6feeaa..0000000
--- a/ventoy
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /opt/ventoy || exit 1
-exec ./Ventoy2Disk.sh "$@"
diff --git a/ventoy-extend-persistent b/ventoy-extend-persistent
deleted file mode 100755
index 9616aa3..0000000
--- a/ventoy-extend-persistent
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /opt/ventoy/ExtendPersistentImg.sh "$@"
diff --git a/ventoy-persistent b/ventoy-persistent
deleted file mode 100755
index c955fb6..0000000
--- a/ventoy-persistent
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /opt/ventoy/CreatePersistentImg.sh "$@"
diff --git a/ventoy-wrapper.sh b/ventoy-wrapper.sh
new file mode 100755
index 0000000..2cd5cf1
--- /dev/null
+++ b/ventoy-wrapper.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+_name="ventoy"
+_PREFIX="/usr/libexec/${_name}"
+_SHAREPREFIX="/usr/share/${_name}"
+config_dir="${XDG_CONFIG_HOME:-$HOME/.config}/$_name"
+
+# clone directory tree and symlink all files in config
+cp -nas "${_PREFIX}" "${XDG_CONFIG_HOME:-$HOME/.config}"
+cp -nas "${_SHAREPREFIX}" "${XDG_CONFIG_HOME:-$HOME/.config}"
+
+cd "$config_dir" || exit 1
+
+# from name of the symlink launch appropriate script
+case "${0##*/}" in
+ "${_name}2disk")
+ exec ./Ventoy2Disk.sh "$@"
+ ;;
+ "${_name}gui")
+ exec ./VentoyGUI "$@"
+ ;;
+ "${_name}plugson")
+ exec ./VentoyPlugson.sh "$@"
+ ;;
+ "${_name}web")
+ exec ./VentoyWeb.sh "$@"
+ ;;
+ "${_name}-create-persistent")
+ exec ./CreatePersistentImg.sh "$@"
+ ;;
+ "${_name}-extend-persistent")
+ exec ./ExtendPersistentImg.sh "$@"
+ ;;
+ "${_name}vlink")
+ exec ./VentoyVlnk.sh "$@"
+ ;;
+ *)
+ echo "Something is wrong with your installation."
+ ;;
+esac
+
+cd - &>/dev/null
+
+
+
diff --git a/ventoy.desktop b/ventoy.desktop
old mode 100755
new mode 100644
diff --git a/ventoy.install b/ventoy.install
deleted file mode 100644
index 7ff7012..0000000
--- a/ventoy.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
- printf "$(tput setaf 4) ->$(tput sgr0; tput bold) %s$(tput sgr0)\n" \
- 'NOTE: You can create persistence images for ventoy with the "ventoy-persistent" command,'
- printf "$(tput setaf 4) ->$(tput sgr0; tput bold) %s$(tput sgr0)\n" \
- ' and losslessly expand persistence ".dat" files using "ventoy-extend-persistent",'
- printf "$(tput setaf 4) ->$(tput sgr0; tput bold) %s$(tput sgr0)\n" \
- ' which are shortcuts to "/opt/ventoy/CreatePersistentImg.sh" and'
- printf "$(tput setaf 4) ->$(tput sgr0; tput bold) %s$(tput sgr0)\n" \
- ' "/opt/ventoy/ExtendPersistentImg.sh", respectively.'
- printf "$(tput setaf 4) ->$(tput sgr0; tput bold) %s$(tput sgr0)\n" \
- ' (See https://www.ventoy.net/en/plugin_persistence.html for documentation.)'
-}
-
-post_remove() {
- # Remove log file
- rm -rf /opt/ventoy/
-}
diff --git a/ventoygui b/ventoygui
deleted file mode 100755
index 887535f..0000000
--- a/ventoygui
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-cd /opt/ventoy || exit 1
-
-if [ "$(uname -m)" = "x86_64" ]; then
- ./VentoyGUI.x86_64 "$@"
-elif [ "$(uname -m)" = "aarch64" ]; then
- ./VentoyGUI.aarch64 "$@"
-fi
diff --git a/ventoyplugson b/ventoyplugson
deleted file mode 100755
index f1e7b2d..0000000
--- a/ventoyplugson
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /opt/ventoy || exit 1
-exec ./VentoyPlugson.sh "$@"
diff --git a/ventoyweb b/ventoyweb
deleted file mode 100755
index fefe649..0000000
--- a/ventoyweb
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /opt/ventoy || exit 1
-exec ./VentoyWeb.sh "$@"