Mirrors/Ventoy
1
0
Fork 0
mirror of https://github.com/ventoy/Ventoy.git synced 2025-04-19 00:45:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

The changes enable the execution of VentoyWeb.sh by specifying the full path to the file, eliminating the need to be in the Ventoy directory

Browse Source
This commit is contained in:
Shamil Mukhumaev 2025-01-23 21:19:52 +03:00
parent ff7ee9c10e
commit 45f1ea2754
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
INSTALL/VentoyWeb.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
print_usage() {
echo 'Usage: VentoyWeb.sh [ OPTION ]'
@ -21,8 +21,6 @@ if [ $uid -ne 0 ]; then
exit 1
fi
OLDDIR=$(pwd)
if uname -m | grep -E -q 'aarch64|arm64'; then
TOOLDIR=aarch64
elif uname -m | grep -E -q 'x86_64|amd64'; then
@ -33,16 +31,13 @@ else
TOOLDIR=i386
fi
if [ ! -f ./tool/$TOOLDIR/V2DServer ]; then
if [ -f ${0%VentoyWeb.sh}/tool/$TOOLDIR/V2DServer ]; then
cd ${0%VentoyWeb.sh}
fi
fi
WORKDIR="$(dirname "$(readlink -f $0)")"
PATH=$WORKDIR/tool/$TOOLDIR:$PATH
PATH=./tool/$TOOLDIR:$PATH
pushd $WORKDIR > /dev/null 2>&1
if [ ! -f ./boot/boot.img ]; then
if [ -d ./grub ]; then
if [ ! -f $WORKDIR/boot/boot.img ]; then
if [ -d $WORKDIR/grub ]; then
echo "Don't run VentoyWeb.sh here, please download the released install package, and run the script in it."
else
echo "Current directory is $PWD"
@ -70,6 +65,12 @@ while [ -n "$1" ]; do
shift
if [ $1 -gt 0 -a $1 -le 65535 ]; then
PORT="$1"
PORT_USED_PID=$(lsof -t -i:$PORT -P -n)
if [ -n "$PORT_USED_PID" ]; then
print_err "The port $PORT is currently in use by the process with PID $PORT_USED_PID"
exit 1
fi
else
print_err "Invalid port $1"
exit 1
@ -85,7 +86,7 @@ if ps -ef | grep "V2DServer.*$HOST.*$PORT" | grep -q -v grep; then
exit 1
fi
LOGFILE=log.txt
LOGFILE=$WORKDIR/log.txt
#delete the log.txt if it's more than 8MB
if [ -f $LOGFILE ]; then
logsize=$(stat -c '%s' $LOGFILE)
@ -95,9 +96,9 @@ if [ -f $LOGFILE ]; then
fi
if [ -f ./tool/$TOOLDIR/V2DServer.xz ]; then
xz -d ./tool/$TOOLDIR/V2DServer.xz
chmod +x ./tool/$TOOLDIR/V2DServer
if [ -f $WORKDIR/tool/$TOOLDIR/V2DServer.xz ]; then
xz -d $WORKDIR/tool/$TOOLDIR/V2DServer.xz
chmod +x $WORKDIR/tool/$TOOLDIR/V2DServer
fi
@ -105,7 +106,7 @@ V2DServer "$HOST" "$PORT" &
wID=$!
sleep 1
vtVer=$(cat ventoy/version)
vtVer=$(cat $WORKDIR/ventoy/version)
echo ""
echo "==============================================================="
if [ "$LANG" = "zh_CN.UTF-8" ]; then
@ -122,9 +123,4 @@ echo ""
wait $wID
if [ -n "$OLDDIR" ]; then
CURDIR=$(pwd)
if [ "$CURDIR" != "$OLDDIR" ]; then
cd "$OLDDIR"
fi
fi
popd $WORKDIR > /dev/null 2>&1