1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
Author: DuckSoft <realducksoft@gmail.com>
I just cannot stand such a dirty package.
Let me do some optimisations.
If you are interested to improve this patch, welcome to mail me.
diff -rup old/tool/ventoy_lib.sh new/tool/ventoy_lib.sh
--- tool/ventoy_lib.sh 2021-12-02 16:59:42.148650182 +0100
+++ tool/ventoy_lib.sh 2021-12-02 17:01:17.214720518 +0100
@@ -29,7 +29,7 @@ vterr() {
}
vtdebug() {
- echo "$*" >> ./log.txt
+ echo "$*" >>/var/log/ventoy.log
}
vtoy_gen_uuid() {
@@ -52,30 +52,6 @@ vtoy_gen_uuid() {
check_tool_work_ok() {
- if echo 1 | hexdump > /dev/null; then
- vtdebug "hexdump test ok ..."
- else
- vtdebug "hexdump test fail ..."
- ventoy_false
- return
- fi
-
- if mkexfatfs -V > /dev/null; then
- vtdebug "mkexfatfs test ok ..."
- else
- vtdebug "mkexfatfs test fail ..."
- ventoy_false
- return
- fi
-
- if vtoycli fat -T; then
- vtdebug "vtoycli fat test ok ..."
- else
- vtdebug "vtoycli fat test fail ..."
- ventoy_false
- return
- fi
-
vtdebug "tool check success ..."
ventoy_true
}
@@ -269,7 +245,7 @@ format_ventoy_disk_mbr() {
else
vtdebug "format disk by fdisk ..."
-fdisk $DISK >>./log.txt 2>&1 <<EOF
+fdisk $DISK >>/var/log/ventoy.log 2>&1 <<EOF
o
n
p
diff -rup old/tool/VentoyWorker.sh new/tool/VentoyWorker.sh
--- tool/VentoyWorker.sh 2021-12-02 16:59:31.485642239 +0100
+++ tool/VentoyWorker.sh 2021-12-02 17:02:00.326752183 +0100
@@ -99,7 +99,7 @@ vtdebug "MODE=$MODE FORCE=$FORCE RESERVE
if check_tool_work_ok; then
vtdebug "check tool work ok"
else
- vterr "Some tools can not run on current system. Please check log.txt for details."
+ vterr "Some tools can not run on current system. Please check /var/log/ventoy.log for details."
exit 1
fi
diff -rup old/Ventoy2Disk.sh new/Ventoy2Disk.sh
--- Ventoy2Disk.sh 2021-12-02 16:59:05.205622608 +0100
+++ Ventoy2Disk.sh 2021-12-02 17:03:29.037816991 +0100
@@ -32,48 +32,4 @@ echo " https://www.ventoy.net"
echo '**********************************************'
echo ''
-
-if ! [ -f ./boot/boot.img ]; then
- if [ -d ./grub ]; then
- echo "Don't run Ventoy2Disk.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
-
-echo "############# Ventoy2Disk $* [$TOOLDIR] ################" >> ./log.txt
-date >> ./log.txt
-
-#decompress tool
-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
-fi
-
-cd ../../
-chmod +x -R ./tool/$TOOLDIR
-
-
-if [ -f /bin/bash ]; then
- /bin/bash ./tool/VentoyWorker.sh $*
-else
- ash ./tool/VentoyWorker.sh $*
-fi
-
-if [ -n "$OLDDIR" ]; then
- CURDIR=$(pwd)
- if [ "$CURDIR" != "$OLDDIR" ]; then
- cd "$OLDDIR"
- fi
-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
TOOLDIR=aarch64
elif echo $machine | egrep -q 'x86_64|amd64'; then
TOOLDIR=x86_64
-elif echo $machine | egrep -q 'mips64'; then
- TOOLDIR=mips64el
elif echo $machine | egrep -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
@@ -15,12 +15,6 @@ print_err() {
echo ""
}
-uid=$(id -u)
-if [ $uid -ne 0 ]; then
- print_err "Please use sudo or run the script as root."
- exit 1
-fi
-
OLDDIR=$(pwd)
if uname -m | egrep -q 'aarch64|arm64'; then
@@ -85,8 +79,8 @@ if ps -ef | grep "V2DServer.*$HOST.*$POR
exit 1
fi
-LOGFILE=log.txt
-#delete the log.txt if it's more than 8MB
+LOGFILE=/var/log/ventoy.log
+#delete the ventoy.log if it's more than 8MB
if [ -f $LOGFILE ]; then
logsize=$(stat -c '%s' $LOGFILE)
if [ $logsize -gt 8388608 ]; then
|