MyFavMirrors/Ventoy
1
0
Fork 0
mirror of https://github.com/ventoy/Ventoy.git synced 2024-12-24 22:25:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

1.0.37 release

Browse Source
This commit is contained in:
longpanda 2021-03-06 19:53:50 +08:00
parent b63ce2a3df
commit 1840cb8f38
12 changed files with 232 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IMG/cpio/ventoy/hook/manjaro/ventoy-disk.sh
View File

@ -59,8 +59,12 @@ else
vtlog "vtLABEL is $vtLABEL from cmdline"
fi
if [ -e "/dev/disk/by-label/$vtLABEL" ]; then
vtlog "/dev/disk/by-label/$vtLABEL already exist"
else
ln -s /dev/$vtDM "/dev/disk/by-label/$vtLABEL"
fi
fi
# OK finish
set_ventoy_hook_finish

10
IMG/mkcpio.sh
View File

@ -142,6 +142,12 @@ rm -rf cpio_tmp
echo '======== SUCCESS ============='
rm -f $VENTOY_PATH/INSTALL/ventoy/ventoy*.cpio
cp -a ventoy*.cpio $VENTOY_PATH/INSTALL/ventoy/
rm -f $VENTOY_PATH/INSTALL/ventoy/ventoy.cpio
rm -f $VENTOY_PATH/INSTALL/ventoy/ventoy_x86.cpio
rm -f $VENTOY_PATH/INSTALL/ventoy/ventoy_arm64.cpio
rm -f $VENTOY_PATH/INSTALL/ventoy/ventoy_mips64.cpio
cp -a ventoy.cpio $VENTOY_PATH/INSTALL/ventoy/
cp -a ventoy_x86.cpio $VENTOY_PATH/INSTALL/ventoy/
cp -a ventoy_arm64.cpio $VENTOY_PATH/INSTALL/ventoy/
cp -a ventoy_mips64.cpio $VENTOY_PATH/INSTALL/ventoy/

2
INSTALL/README
View File

@ -21,6 +21,8 @@ Please refer https://www.ventoy.net/en/doc_start.html for details.
1. sudo sh VentoyWeb.sh
2. open your browser and visit http://127.0.0.1:24680
========== VentoyWebDeepin.sh ===============
1. sudo sh VentoyWebDeepin.sh
========== CreatePersistentImg.sh ===============

2
INSTALL/Ventoy2Disk.sh
View File

@ -16,6 +16,8 @@ if uname -m | egrep -q 'aarch64|arm64'; then
export TOOLDIR=aarch64
elif uname -m | egrep -q 'x86_64|amd64'; then
export TOOLDIR=x86_64
elif uname -m | egrep -q 'mips64'; then
export TOOLDIR=mips64el
else
export TOOLDIR=i386
fi

2
INSTALL/VentoyWeb.sh
View File

@ -27,6 +27,8 @@ if uname -m | egrep -q 'aarch64|arm64'; then
TOOLDIR=aarch64
elif uname -m | egrep -q 'x86_64|amd64'; then
TOOLDIR=x86_64
elif uname -m | egrep -q 'mips64'; then
TOOLDIR=mips64el
else
TOOLDIR=i386
fi

192
INSTALL/VentoyWebDeepin.sh Normal file
View File

@ -0,0 +1,192 @@
#!/bin/sh
print_usage() {
echo 'Usage: VentoyWebDeepin.sh [ OPTION ]'
echo ' OPTION: (optional)'
echo ' -H x.x.x.x http server IP address (default is 127.0.0.1)'
echo ' -p PORT http server PORT (default is 24680)'
echo ' -h print this help'
echo ''
}
print_err() {
echo ""
echo "$*"
echo ""
}
get_user() {
name=$(logname)
if [ -n "$name" -a "$name" != "root" ]; then
echo $name; return
fi
name=${HOME#/home/}
if [ -n "$name" -a "$name" != "root" ]; then
echo $name; return
fi
}
uid=$(id -u)
if [ $uid -ne 0 ]; then
exec sudo sh $0 $*
fi
OLDDIR=$(pwd)
if uname -m | egrep -q 'aarch64|arm64'; then
TOOLDIR=aarch64
elif uname -m | egrep -q 'x86_64|amd64'; then
TOOLDIR=x86_64
elif uname -m | egrep -q 'mips64'; then
TOOLDIR=mips64el
else
TOOLDIR=i386
fi
if [ ! -f ./tool/$TOOLDIR/V2DServer ]; then
if [ -f ${0%VentoyWebDeepin.sh}/tool/$TOOLDIR/V2DServer ]; then
cd ${0%VentoyWebDeepin.sh}
fi
fi
PATH=./tool/$TOOLDIR:$PATH
if [ ! -f ./boot/boot.img ]; then
if [ -d ./grub ]; then
echo "Don't run VentoyWebDeepin.sh here, please download the released install package, and run the script in it."
else
echo "Please run under the correct directory!"
fi
exit 1
fi
HOST="127.0.0.1"
PORT=24680
while [ -n "$1" ]; do
if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
print_usage
exit 0
elif [ "$1" = "-H" ]; then
shift
if echo $1 | grep -q '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*'; then
HOST="$1"
else
print_err "Invalid host $1"
exit 1
fi
elif [ "$1" = "-p" ]; then
shift
if [ $1 -gt 0 -a $1 -le 65535 ]; then
PORT="$1"
else
print_err "Invalid port $1"
exit 1
fi
fi
shift
done
if ps -ef | grep "V2DServer.*$HOST.*$PORT" | grep -q -v grep; then
print_err "Another ventoy server is running now, please close it first."
exit 1
fi
VUSER=$(get_user)
LOGFILE=log.txt
if [ -e $LOGFILE ]; then
chown $VUSER $LOGFILE
else
su $VUSER -c "touch $LOGFILE"
fi
#delete the log.txt if it's more than 8MB
if [ -f $LOGFILE ]; then
logsize=$(stat -c '%s' $LOGFILE)
if [ $logsize -gt 8388608 ]; then
rm -f $LOGFILE
fi
fi
if [ -f ./tool/$TOOLDIR/V2DServer.xz ]; then
xz -d ./tool/$TOOLDIR/V2DServer.xz
chmod +x ./tool/$TOOLDIR/V2DServer
fi
rm -rf ./*_VTMPDIR
vtWebTmpDir=$(mktemp -d -p ./ --suffix=_VTMPDIR)
chown $VUSER $vtWebTmpDir
V2DServer "$HOST" "$PORT" &
V2DPid=$!
sleep 1
su $VUSER -c "browser --window-size=550,400 --app=\"http://${HOST}:${PORT}/index.html?chrome-app\" --user-data-dir=$vtWebTmpDir >> $LOGFILE 2>&1" &
WebPid=$!
vtoy_trap_exit() {
[ -d /proc/$V2DPid ] && kill -2 $V2DPid
[ -d /proc/$WebPid ] && kill -9 $WebPid
while [ -n "1" ]; do
curPid=$(ps -ef | grep -m1 "$vtWebTmpDir" | egrep -v '\sgrep\s' | awk '{print $2}')
if [ -z "$curPid" ]; then
break
fi
if [ -d /proc/$curPid ]; then
kill -9 $curPid
fi
done
[ -d $vtWebTmpDir ] && rm -rf $vtWebTmpDir
if [ -n "$OLDDIR" ]; then
CURDIR=$(pwd)
if [ "$CURDIR" != "$OLDDIR" ]; then
cd "$OLDDIR"
fi
fi
exit 1
}
trap vtoy_trap_exit HUP INT QUIT TSTP
sleep 1
vtVer=$(cat ventoy/version)
echo ""
echo "=================================================="
if [ "$LANG" = "zh_CN.UTF-8" ]; then
echo " Ventoy Server $vtVer 已经启动 ..."
else
echo " Ventoy Server $vtVer is running ..."
fi
echo "=================================================="
echo ""
echo "########### Press Ctrl + C to exit ###############"
echo ""
wait $WebPid
[ -d /proc/$V2DPid ] && kill -2 $V2DPid
[ -d $vtWebTmpDir ] && rm -rf $vtWebTmpDir
if [ -n "$OLDDIR" ]; then
CURDIR=$(pwd)
if [ "$CURDIR" != "$OLDDIR" ]; then
cd "$OLDDIR"
fi
fi

2
INSTALL/grub/grub.cfg
View File

@ -1584,7 +1584,7 @@ function img_unsupport_menuentry {
#############################################################
#############################################################
set VENTOY_VERSION="1.0.36"
set VENTOY_VERSION="1.0.37"
#ACPI not compatible with Window7/8, so disable by default
set VTOY_PARAM_NO_ACPI=1

6
INSTALL/ventoy_pack.sh
View File

@ -94,11 +94,15 @@ cp $OPT ./tool $tmpdir/
rm -f $tmpdir/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
cp $OPT Ventoy2Disk.sh $tmpdir/
cp $OPT VentoyWeb.sh $tmpdir/
cp $OPT VentoyWebDeepin.sh $tmpdir/
#cp $OPT Ventoy.desktop $tmpdir/
cp $OPT README $tmpdir/
cp $OPT plugin $tmpdir/
cp $OPT CreatePersistentImg.sh $tmpdir/
dos2unix -q $tmpdir/Ventoy2Disk.sh
dos2unix -q $tmpdir/VentoyWeb.sh
dos2unix -q $tmpdir/VentoyWebDeepin.sh
#dos2unix -q $tmpdir/Ventoy.desktop
dos2unix -q $tmpdir/CreatePersistentImg.sh
cp $OPT ../LinuxGUI/WebUI $tmpdir/
@ -130,6 +134,8 @@ find $tmpdir/ -type d -exec chmod 755 "{}" +
find $tmpdir/ -type f -exec chmod 644 "{}" +
chmod +x $tmpdir/Ventoy2Disk.sh
chmod +x $tmpdir/VentoyWeb.sh
chmod +x $tmpdir/VentoyWebDeepin.sh
#chmod +x $tmpdir/Ventoy.desktop
chmod +x $tmpdir/CreatePersistentImg.sh
tar -czvf ventoy-${curver}-linux.tar.gz $tmpdir

BIN
LANGUAGES/languages.ini
View File

Binary file not shown.

16
LinuxGUI/WebUI/index.html
View File

@ -171,7 +171,7 @@
</style>
</head>
<body style="overflow:hidden">
<body style="overflow:hidden;">
<div class="wrapper" >
<!-- Content Wrapper. Contains page content -->
<div id='vtoy_main_div' style='width:540px; position:absolute;'>
@ -580,11 +580,16 @@
}
function ResizeWindow() {
//console.log(window.screen.width + ' [x1] ' + window.screen.height);
//console.log(window.screen.availWidth + ' [x1] ' + window.screen.availHeight);
//console.log(vtoy_app_width + ' [x2] ' + vtoy_app_height);
//console.log((window.screen.width - vtoy_app_width) / 2 + ' [x3] ' + (window.screen.height - vtoy_app_height) / 2);
window.moveTo((window.screen.width - vtoy_app_width) / 2, (window.screen.height - vtoy_app_height) / 2);
//console.log((window.screen.availWidth - vtoy_app_width) / 2 + ' [x3] ' + (window.screen.availHeight - vtoy_app_height) / 2);
window.onresize = function() { };
window.resizeTo(vtoy_app_width, vtoy_app_height);
window.moveTo((window.screen.availWidth - vtoy_app_width) / 2, (window.screen.availHeight - vtoy_app_height) / 2);
window.onresize = ResizeWindow;
}
function MoveMainDivToCenter() {
@ -1012,9 +1017,6 @@
$('#vtoy_part_align_4kb').prop("checked", true);
if (vtoy_chrome_app_mode) {
window.onresize = function() {
ResizeWindow();
}
ResizeWindow();
} else {
$('#vtoy_main_div').css("border", '2px solid #f4f4f4');

BIN
LinuxGUI/WebUI/static/img/VentoyLogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

4
vtoyfat/fat_io_lib/buildlib.sh
View File

@ -27,6 +27,10 @@ ar -rc libfat_io_aa64.a *.o
rm -f *.o
mips64el-linux-musl-gcc -mips64r2 -mabi=64 -O2 -D_FILE_OFFSET_BITS=64 fat*.c -c
ar -rc libfat_io_m64e.a *.o
rm -f *.o
cd -