From bf797ceadbc70f004bcb0ea463ca568f1e622bfe Mon Sep 17 00:00:00 2001 From: longpanda Date: Tue, 20 Dec 2022 18:46:04 +0800 Subject: [PATCH] Fix the drive letter case check issue for VentoyPlugson in Windows. (#2078) --- Plugson/pack.sh | 6 ++++++ Plugson/www/buildtime | 2 +- Plugson/www/helplist | 2 +- Plugson/www/index.html | 8 ++++---- Plugson/www/menulist | 2 +- Plugson/www/static/js/vtoy.js | 9 ++++++++- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Plugson/pack.sh b/Plugson/pack.sh index 340a79fa..cc2eb589 100644 --- a/Plugson/pack.sh +++ b/Plugson/pack.sh @@ -22,6 +22,12 @@ if [ -f ./www.tar.xz ]; then rm -f ./www.tar.xz fi +VV=$(grep -m1 '\?v=' ./www/index.html | sed 's/.*v=\([0-9][0-9]*\).*/\1/g') +let VV++ +echo V=$VV +sed "s/\?v=[0-9][0-9]*/?v=$VV/g" -i ./www/index.html + + [ -f ./www/helplist ] && rm -f ./www/helplist ls -1 ../INSTALL/grub/help/ | while read line; do echo -n ${line:0:5} >> ./www/helplist diff --git a/Plugson/www/buildtime b/Plugson/www/buildtime index 81db8dee..5d528f42 100644 --- a/Plugson/www/buildtime +++ b/Plugson/www/buildtime @@ -1 +1 @@ -20221204 12:35:33 \ No newline at end of file +20221220 18:30:51 \ No newline at end of file diff --git a/Plugson/www/helplist b/Plugson/www/helplist index ac241041..a3c78091 100644 --- a/Plugson/www/helplist +++ b/Plugson/www/helplist @@ -1 +1 @@ -bn_BNde_DEen_USfr_FRhi_HIhr_HRid_IDja_JPko_KRpt_PTru_RUsr_RStr_TRzh_CN \ No newline at end of file +ar_ARbn_BNde_DEen_USfr_FRhi_HIhr_HRhu_HUid_IDja_JPka_GEko_KRpl_PLpt_PTru_RUsr_RSta_INtr_TRzh_CNzh_TW \ No newline at end of file diff --git a/Plugson/www/index.html b/Plugson/www/index.html index 00aba199..02d27c6a 100644 --- a/Plugson/www/index.html +++ b/Plugson/www/index.html @@ -757,7 +757,7 @@ @@ -777,10 +777,10 @@ - + - - + + diff --git a/Plugson/www/menulist b/Plugson/www/menulist index ac241041..a3c78091 100644 --- a/Plugson/www/menulist +++ b/Plugson/www/menulist @@ -1 +1 @@ -bn_BNde_DEen_USfr_FRhi_HIhr_HRid_IDja_JPko_KRpt_PTru_RUsr_RStr_TRzh_CN \ No newline at end of file +ar_ARbn_BNde_DEen_USfr_FRhi_HIhr_HRhu_HUid_IDja_JPka_GEko_KRpl_PLpt_PTru_RUsr_RSta_INtr_TRzh_CNzh_TW \ No newline at end of file diff --git a/Plugson/www/static/js/vtoy.js b/Plugson/www/static/js/vtoy.js index afb10837..ad82628b 100644 --- a/Plugson/www/static/js/vtoy.js +++ b/Plugson/www/static/js/vtoy.js @@ -33,6 +33,8 @@ function ventoy_get_ulen(str) { function ventoy_common_check_path(path) { + var curdir + if (path.indexOf('//') >= 0) { return false; } @@ -41,7 +43,12 @@ function ventoy_common_check_path(path) { return false; } - if (path.substr(0, g_current_dir.length) != g_current_dir) { + curdir = path.substr(0, g_current_dir.length); + if (curdir.match("^[a-z]:$")) { + curdir = curdir.toUpperCase(); + } + + if (curdir != g_current_dir) { return false; }