diff --git a/assets/languages.json b/assets/languages.json index f1047d2..378b12b 100644 --- a/assets/languages.json +++ b/assets/languages.json @@ -255,7 +255,7 @@ "name": "Chinese Simplified (简体中文)", "FontFamily": "宋体", "FontSize": 14, - "Author": "longpanda", + "Author": "vasilito (hiperiso)", "STR_ERROR": "错误", "STR_WARNING": "警告", "STR_INFO": "提醒", @@ -381,7 +381,7 @@ "name": "English (English)", "FontFamily": "Courier New", "FontSize": 16, - "Author": "longpanda", + "Author": "vasilito (hiperiso)", "STR_ERROR": "Error", "STR_WARNING": "Warning", "STR_INFO": "Info", @@ -1956,7 +1956,7 @@ "name": "Thai (ไทย)", "FontFamily": "Courier New", "FontSize": 17, - "Author": "longpanda", + "Author": "vasilito (hiperiso)", "STR_ERROR": "ผิดพลาด", "STR_WARNING": "คำเตือน", "STR_INFO": "ข้อมูล", diff --git a/src/grub2/Makefile.core.def b/src/grub2/Makefile.core.def index 1ab201e..fd44287 100644 --- a/src/grub2/Makefile.core.def +++ b/src/grub2/Makefile.core.def @@ -1620,7 +1620,7 @@ module = { common = gfxmenu/gui_string_util.c; }; -/* Added by longpanda for Hiperiso Project */ +/* Added by longpanda for the Hiperiso Project (built upon Ventoy by longpanda) */ module = { name = hiperiso; common = hiperiso/hiperiso.c; diff --git a/src/grub2/grub/grub.cfg b/src/grub2/grub/grub.cfg index bc39ede..2e0a783 100644 --- a/src/grub2/grub/grub.cfg +++ b/src/grub2/grub/grub.cfg @@ -1,5 +1,5 @@ #************************************************************************************ -# Copyright (c) 2020, longpanda +# Copyright (c) 2020, longpanda # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -2149,8 +2149,8 @@ function hiperiso_img_openwrt { set openwrt_plugin_need=1 if [ ! -f ${hiso_iso_part}/hiperiso/hiperiso_openwrt.xz ]; then hiperiso_gui_console - echo -e "\n hiperiso_openwrt.xz not found. Please refer https://www.hiperiso.net/en/doc_openwrt.html.\n" - echo -e " 未找到 hiperiso_openwrt.xz 文件。请参考 https://www.hiperiso.net/cn/doc_openwrt.html\n" + echo -e "\n hiperiso_openwrt.xz not found. Please refer https://redbearos.org/hiperiso/en/doc_openwrt.html.\n" + echo -e " 未找到 hiperiso_openwrt.xz 文件。请参考 https://redbearos.org/hiperiso/cn/doc_openwrt.html\n" echo -en "\n$VTLANG_ENTER_EXIT ..." read vtInputKey hiperiso_cli_console @@ -2162,8 +2162,8 @@ function hiperiso_img_openwrt { hiperiso_debug_pause else hiperiso_gui_console - echo -e "\n IMG file need processed. Please refer https://www.hiperiso.net/en/doc_openwrt.html.\n" - echo -e " 此 IMG 文件必须处理之后才能支持。请参考 https://www.hiperiso.net/cn/doc_openwrt.html\n" + echo -e "\n IMG file need processed. Please refer https://redbearos.org/hiperiso/en/doc_openwrt.html.\n" + echo -e " 此 IMG 文件必须处理之后才能支持。请参考 https://redbearos.org/hiperiso/cn/doc_openwrt.html\n" echo -e "\n press ENTER to exit (请按 回车 键返回) ..." read vtInputKey hiperiso_cli_console @@ -2606,20 +2606,20 @@ function hiperiso_boot { if [ "$grub_platform" = "pc" ]; then - set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION BIOS www.hiperiso.net" + set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION BIOS redbearos.org/hiperiso" else if [ "$grub_cpu" = "i386" ]; then set HISO_EFI_ARCH=ia32 - set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION IA32 www.hiperiso.net" + set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION IA32 redbearos.org/hiperiso" elif [ "$grub_cpu" = "arm64" ]; then set HISO_EFI_ARCH=aa64 - set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION AA64 www.hiperiso.net" + set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION AA64 redbearos.org/hiperiso" elif [ "$grub_cpu" = "mips64el" ]; then set HISO_EFI_ARCH=mips - set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION MIPS www.hiperiso.net" + set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION MIPS redbearos.org/hiperiso" else set HISO_EFI_ARCH=x64 - set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION UEFI www.hiperiso.net" + set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION UEFI redbearos.org/hiperiso" fi fi diff --git a/src/grub2/hiperiso.c b/src/grub2/hiperiso.c index 3cb1a95..4cc355e 100644 --- a/src/grub2/hiperiso.c +++ b/src/grub2/hiperiso.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso.c * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/grub2/hiperiso.h b/src/grub2/hiperiso.h index 9499690..e73ef9e 100644 --- a/src/grub2/hiperiso.h +++ b/src/grub2/hiperiso.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso.h * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/grub2/hiperiso_browser.c b/src/grub2/hiperiso_browser.c index b8f8e34..7460c59 100644 --- a/src/grub2/hiperiso_browser.c +++ b/src/grub2/hiperiso_browser.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_browser.c * - * Copyright (c) 2022, longpanda + * Copyright (c) 2022, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/grub2/hiperiso_cmd.c b/src/grub2/hiperiso_cmd.c index cc0187c..54c6dc4 100644 --- a/src/grub2/hiperiso_cmd.c +++ b/src/grub2/hiperiso_cmd.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_cmd.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -548,7 +548,7 @@ static int hiperiso_set_check_result(int ret, const char *msg) grub_printf("This is NOT a standard Hiperiso device and is NOT supported (%d).\n", ret); grub_printf("Error message: <%s>\n\n", msg); - grub_printf("You should follow the instructions in https://www.hiperiso.net to use Hiperiso.\n"); + grub_printf("You should follow the instructions in https://redbearos.org/hiperiso to use Hiperiso.\n"); grub_refresh(); } diff --git a/src/grub2/hiperiso_def.h b/src/grub2/hiperiso_def.h index 168410b..160318c 100644 --- a/src/grub2/hiperiso_def.h +++ b/src/grub2/hiperiso_def.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_def.h * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/grub2/hiperiso_json.c b/src/grub2/hiperiso_json.c index 04771d2..b574835 100644 --- a/src/grub2/hiperiso_json.c +++ b/src/grub2/hiperiso_json.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_json.c * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/grub2/hiperiso_linux.c b/src/grub2/hiperiso_linux.c index bf55ff4..4b0587c 100644 --- a/src/grub2/hiperiso_linux.c +++ b/src/grub2/hiperiso_linux.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_linux.c * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/grub2/hiperiso_plugin.c b/src/grub2/hiperiso_plugin.c index 8b4fa97..c2fae79 100644 --- a/src/grub2/hiperiso_plugin.c +++ b/src/grub2/hiperiso_plugin.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_plugin.c * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/grub2/hiperiso_unix.c b/src/grub2/hiperiso_unix.c index c958b1d..216a673 100644 --- a/src/grub2/hiperiso_unix.c +++ b/src/grub2/hiperiso_unix.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_unix.c * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/grub2/hiperiso_vhd.c b/src/grub2/hiperiso_vhd.c index 476fafc..0abc586 100644 --- a/src/grub2/hiperiso_vhd.c +++ b/src/grub2/hiperiso_vhd.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_vhd.c * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/grub2/hiperiso_windows.c b/src/grub2/hiperiso_windows.c index e61a49b..e75442d 100644 --- a/src/grub2/hiperiso_windows.c +++ b/src/grub2/hiperiso_windows.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_windows.c * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Core/hiperiso_crc32.c b/src/gui/Core/hiperiso_crc32.c index d5a5cfc..5090c5a 100644 --- a/src/gui/Core/hiperiso_crc32.c +++ b/src/gui/Core/hiperiso_crc32.c @@ -1,7 +1,7 @@ /****************************************************************************** * crc32.c ---- hiperiso crc32 * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Core/hiperiso_define.h b/src/gui/Core/hiperiso_define.h index ac9cca0..34b8255 100644 --- a/src/gui/Core/hiperiso_define.h +++ b/src/gui/Core/hiperiso_define.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_define.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Core/hiperiso_disk.c b/src/gui/Core/hiperiso_disk.c index ea5d97d..6d08ac8 100644 --- a/src/gui/Core/hiperiso_disk.c +++ b/src/gui/Core/hiperiso_disk.c @@ -1,6 +1,6 @@ /****************************************************************************** * hiperiso_disk.c ---- hiperiso disk - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Core/hiperiso_disk.h b/src/gui/Core/hiperiso_disk.h index b2f94a9..a7a8db5 100644 --- a/src/gui/Core/hiperiso_disk.h +++ b/src/gui/Core/hiperiso_disk.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_disk.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Core/hiperiso_json.c b/src/gui/Core/hiperiso_json.c index a60fd11..eb9bd1d 100644 --- a/src/gui/Core/hiperiso_json.c +++ b/src/gui/Core/hiperiso_json.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_json.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Core/hiperiso_json.h b/src/gui/Core/hiperiso_json.h index 5b727a3..82487e6 100644 --- a/src/gui/Core/hiperiso_json.h +++ b/src/gui/Core/hiperiso_json.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_json.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Core/hiperiso_log.c b/src/gui/Core/hiperiso_log.c index f74f8fe..bf31e7a 100644 --- a/src/gui/Core/hiperiso_log.c +++ b/src/gui/Core/hiperiso_log.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_log.c ---- hiperiso log * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Core/hiperiso_md5.c b/src/gui/Core/hiperiso_md5.c index bf0aa2b..5f2ca5d 100644 --- a/src/gui/Core/hiperiso_md5.c +++ b/src/gui/Core/hiperiso_md5.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_md5.c ---- hiperiso md5 * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Core/hiperiso_util.c b/src/gui/Core/hiperiso_util.c index b404ca2..efc53ca 100644 --- a/src/gui/Core/hiperiso_util.c +++ b/src/gui/Core/hiperiso_util.c @@ -1,6 +1,6 @@ /****************************************************************************** * hiperiso_util.c ---- hiperiso util - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Core/hiperiso_util.h b/src/gui/Core/hiperiso_util.h index 0872557..b6762b3 100644 --- a/src/gui/Core/hiperiso_util.h +++ b/src/gui/Core/hiperiso_util.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_util.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/GTK/hiperiso_gtk.c b/src/gui/GTK/hiperiso_gtk.c index 2e4c832..3ed9aac 100644 --- a/src/gui/GTK/hiperiso_gtk.c +++ b/src/gui/GTK/hiperiso_gtk.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_gtk.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/GTK/hiperiso_gtk.h b/src/gui/GTK/hiperiso_gtk.h index 07eef91..fc17a89 100644 --- a/src/gui/GTK/hiperiso_gtk.h +++ b/src/gui/GTK/hiperiso_gtk.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_gtk.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/GTK/refresh_icon_data.c b/src/gui/GTK/refresh_icon_data.c index 838371d..9242790 100644 --- a/src/gui/GTK/refresh_icon_data.c +++ b/src/gui/GTK/refresh_icon_data.c @@ -1,7 +1,7 @@ /****************************************************************************** * refresh_icon_data.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/GTK/secure_icon_data.c b/src/gui/GTK/secure_icon_data.c index b3f8b7e..7a6fe9f 100644 --- a/src/gui/GTK/secure_icon_data.c +++ b/src/gui/GTK/secure_icon_data.c @@ -1,7 +1,7 @@ /****************************************************************************** * secure_icon_data.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/GTK/window_icon_data.c b/src/gui/GTK/window_icon_data.c index 17b6ac8..36b199c 100644 --- a/src/gui/GTK/window_icon_data.c +++ b/src/gui/GTK/window_icon_data.c @@ -1,7 +1,7 @@ /****************************************************************************** * window_icon_data.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Include/Hiperiso2Disk.h b/src/gui/Include/Hiperiso2Disk.h index 1fc3c0f..ac3eea1 100644 --- a/src/gui/Include/Hiperiso2Disk.h +++ b/src/gui/Include/Hiperiso2Disk.h @@ -1,7 +1,7 @@ /****************************************************************************** * Hiperiso2Disk.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/QT/hiperiso_qt.h b/src/gui/QT/hiperiso_qt.h index 3afb4c6..b8598a6 100644 --- a/src/gui/QT/hiperiso_qt.h +++ b/src/gui/QT/hiperiso_qt.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_qt.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/QT/hiperiso_qt_stub.c b/src/gui/QT/hiperiso_qt_stub.c index 2e0bcac..98ef23f 100644 --- a/src/gui/QT/hiperiso_qt_stub.c +++ b/src/gui/QT/hiperiso_qt_stub.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_qt_stub.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/QT/refresh_icon_data.c b/src/gui/QT/refresh_icon_data.c index 838371d..9242790 100644 --- a/src/gui/QT/refresh_icon_data.c +++ b/src/gui/QT/refresh_icon_data.c @@ -1,7 +1,7 @@ /****************************************************************************** * refresh_icon_data.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/QT/secure_icon_data.c b/src/gui/QT/secure_icon_data.c index b3f8b7e..7a6fe9f 100644 --- a/src/gui/QT/secure_icon_data.c +++ b/src/gui/QT/secure_icon_data.c @@ -1,7 +1,7 @@ /****************************************************************************** * secure_icon_data.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Web/hiperiso_http.c b/src/gui/Web/hiperiso_http.c index 6a79b72..2b61b16 100644 --- a/src/gui/Web/hiperiso_http.c +++ b/src/gui/Web/hiperiso_http.c @@ -1,6 +1,6 @@ /****************************************************************************** * hiperiso_http.c ---- hiperiso http - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/gui/Web/hiperiso_http.h b/src/gui/Web/hiperiso_http.h index 7c4a852..1656979 100644 --- a/src/gui/Web/hiperiso_http.h +++ b/src/gui/Web/hiperiso_http.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_http.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/hisocli/crc32.c b/src/hisocli/crc32.c index 7f835cc..c6676ca 100644 --- a/src/hisocli/crc32.c +++ b/src/hisocli/crc32.c @@ -1,7 +1,7 @@ /****************************************************************************** * hisogpt.c ---- hiperiso gpt util * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/hisocli/hisocli.c b/src/hisocli/hisocli.c index 197cdb2..9052776 100644 --- a/src/hisocli/hisocli.c +++ b/src/hisocli/hisocli.c @@ -1,7 +1,7 @@ /****************************************************************************** * hisocli.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/hisocli/hisocli.h b/src/hisocli/hisocli.h index 6d21895..4dca36e 100644 --- a/src/hisocli/hisocli.h +++ b/src/hisocli/hisocli.h @@ -1,7 +1,7 @@ /****************************************************************************** * hisocli.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/hisocli/hisofat.c b/src/hisocli/hisofat.c index 71a5e06..a684c6d 100644 --- a/src/hisocli/hisofat.c +++ b/src/hisocli/hisofat.c @@ -1,7 +1,7 @@ /****************************************************************************** * hisofat.c ---- Parse fat file system * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/hisocli/hisogpt.c b/src/hisocli/hisogpt.c index ebd6a95..80fe446 100644 --- a/src/hisocli/hisogpt.c +++ b/src/hisocli/hisogpt.c @@ -1,7 +1,7 @@ /****************************************************************************** * hisogpt.c ---- hiperiso gpt util * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/hisocli/partresize.c b/src/hisocli/partresize.c index ce55d94..d17f333 100644 --- a/src/hisocli/partresize.c +++ b/src/hisocli/partresize.c @@ -1,7 +1,7 @@ /****************************************************************************** * partresize.c ---- hiperiso part resize util * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/hisofat/hisofat_linux.c b/src/hisofat/hisofat_linux.c index a73ae61..4cab064 100644 --- a/src/hisofat/hisofat_linux.c +++ b/src/hisofat/hisofat_linux.c @@ -1,7 +1,7 @@ /****************************************************************************** * hisofat.c ---- Parse fat file system * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/hisogpt/crc32.c b/src/hisogpt/crc32.c index fca19e6..68875ce 100644 --- a/src/hisogpt/crc32.c +++ b/src/hisogpt/crc32.c @@ -1,7 +1,7 @@ /****************************************************************************** * hisogpt.c ---- hiperiso gpt util * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/hisogpt/hisogpt.c b/src/hisogpt/hisogpt.c index 0d9e1e5..fe33b29 100644 --- a/src/hisogpt/hisogpt.c +++ b/src/hisogpt/hisogpt.c @@ -1,7 +1,7 @@ /****************************************************************************** * hisogpt.c ---- hiperiso gpt util * - * Copyright (c) 2020, longpanda + * Copyright (c) 2020, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/hisolnk/crc32.c b/src/hisolnk/crc32.c index 698d4c5..c6391ea 100644 --- a/src/hisolnk/crc32.c +++ b/src/hisolnk/crc32.c @@ -1,7 +1,7 @@ /****************************************************************************** * crc32.c ---- * - * Copyright (c) 2022, longpanda + * Copyright (c) 2022, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/installer/Hiperiso2Disk.sh b/src/installer/Hiperiso2Disk.sh index 73e39a9..f6a8a26 100644 --- a/src/installer/Hiperiso2Disk.sh +++ b/src/installer/Hiperiso2Disk.sh @@ -27,8 +27,8 @@ export PATH="$PWD/tool/$TOOLDIR:$PATH" echo '' echo '**********************************************' echo " Hiperiso: $curver $TOOLDIR" -echo " longpanda admin@hiperiso.net" -echo " https://www.hiperiso.net" +echo " vasilito adminpupkin@gmail.com" +echo " https://redbearos.org/hiperiso" echo '**********************************************' echo '' diff --git a/src/installer/tool/HiperisoWorker.sh b/src/installer/tool/HiperisoWorker.sh index 9868f71..fb4feb5 100644 --- a/src/installer/tool/HiperisoWorker.sh +++ b/src/installer/tool/HiperisoWorker.sh @@ -379,6 +379,21 @@ if [ "$MODE" = "install" -a -z "$NONDESTRUCTIVE" ]; then hisocli partresize -s $DISK $part2_start_sector fi + hisoinfo "copying hiperiso EFI binaries to data partition ..." + MOUNT_DIR="./tmp_hiso_mnt" + rm -rf "$MOUNT_DIR" + mkdir -p "$MOUNT_DIR" + if mount -t exfat ${PART1} "$MOUNT_DIR" 2>/dev/null; then + mkdir -p "$MOUNT_DIR/hiperiso" + cp -a ./hiperiso/. "$MOUNT_DIR/hiperiso/" 2>/dev/null + sync + umount "$MOUNT_DIR" + else + hisowarn "Could not mount ${PART1} to copy hiperiso binaries." + hisowarn "Manually copy ./hiperiso/* to the data partition root." + fi + rm -rf "$MOUNT_DIR" + echo "" hisoinfo "Install Hiperiso to $DISK successfully finished." sync diff --git a/src/plugson/src/Core/hiperiso_crc32.c b/src/plugson/src/Core/hiperiso_crc32.c index c10bb0b..897e5a2 100644 --- a/src/plugson/src/Core/hiperiso_crc32.c +++ b/src/plugson/src/Core/hiperiso_crc32.c @@ -1,7 +1,7 @@ /****************************************************************************** * crc32.c ---- hiperiso crc32 * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_define.h b/src/plugson/src/Core/hiperiso_define.h index aa77eb7..69e1b7c 100644 --- a/src/plugson/src/Core/hiperiso_define.h +++ b/src/plugson/src/Core/hiperiso_define.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_define.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_disk.c b/src/plugson/src/Core/hiperiso_disk.c index f2a2809..9dbdc10 100644 --- a/src/plugson/src/Core/hiperiso_disk.c +++ b/src/plugson/src/Core/hiperiso_disk.c @@ -1,6 +1,6 @@ /****************************************************************************** * hiperiso_disk.c ---- hiperiso disk - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_disk.h b/src/plugson/src/Core/hiperiso_disk.h index 09f5b66..875a41f 100644 --- a/src/plugson/src/Core/hiperiso_disk.h +++ b/src/plugson/src/Core/hiperiso_disk.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_disk.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_disk_linux.c b/src/plugson/src/Core/hiperiso_disk_linux.c index 5c0491e..3c573f1 100644 --- a/src/plugson/src/Core/hiperiso_disk_linux.c +++ b/src/plugson/src/Core/hiperiso_disk_linux.c @@ -1,6 +1,6 @@ /****************************************************************************** * hiperiso_disk.c ---- hiperiso disk - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -414,7 +414,7 @@ static int fatlib_get_hiperiso_version(char *verbuf, int bufsize) return rc; } -/* : Deleted by longpanda, 20211028 PN:XX LABEL:XX */ +/* : Deleted by vasilito, 20211028 PN:XX LABEL:XX */ #if 0 int hiperiso_get_hiso_data(hiperiso_disk *info, int *ppartstyle) { @@ -578,7 +578,7 @@ end: return rc; } #endif /* #if 0 */ -/* : Deleted by longpanda, 20211028 PN:XX LABEL:XX */ +/* : Deleted by vasilito, 20211028 PN:XX LABEL:XX */ int hiperiso_get_disk_info(char **argv) diff --git a/src/plugson/src/Core/hiperiso_disk_windows.c b/src/plugson/src/Core/hiperiso_disk_windows.c index 7eb3c44..5fc2b6a 100644 --- a/src/plugson/src/Core/hiperiso_disk_windows.c +++ b/src/plugson/src/Core/hiperiso_disk_windows.c @@ -1,6 +1,6 @@ /****************************************************************************** * hiperiso_disk.c ---- hiperiso disk - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_json.c b/src/plugson/src/Core/hiperiso_json.c index ff8bd00..706da51 100644 --- a/src/plugson/src/Core/hiperiso_json.c +++ b/src/plugson/src/Core/hiperiso_json.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_json.c * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_json.h b/src/plugson/src/Core/hiperiso_json.h index 9d63e92..73cc0af 100644 --- a/src/plugson/src/Core/hiperiso_json.h +++ b/src/plugson/src/Core/hiperiso_json.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_json.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_log.c b/src/plugson/src/Core/hiperiso_log.c index fea7639..8817605 100644 --- a/src/plugson/src/Core/hiperiso_log.c +++ b/src/plugson/src/Core/hiperiso_log.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_log.c ---- hiperiso log * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_md5.c b/src/plugson/src/Core/hiperiso_md5.c index e684ee4..85da315 100644 --- a/src/plugson/src/Core/hiperiso_md5.c +++ b/src/plugson/src/Core/hiperiso_md5.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_md5.c ---- hiperiso md5 * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_utf.c b/src/plugson/src/Core/hiperiso_utf.c index a13564a..9a1e5bd 100644 --- a/src/plugson/src/Core/hiperiso_utf.c +++ b/src/plugson/src/Core/hiperiso_utf.c @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_utf.c ---- hiperiso utf * Copyright (c) 2022, Davipb https://github.com/Davipb/utf8-utf16-converter - * Copyright (c) 2022, longpanda + * Copyright (c) 2022, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_util.c b/src/plugson/src/Core/hiperiso_util.c index 7f56434..00ce759 100644 --- a/src/plugson/src/Core/hiperiso_util.c +++ b/src/plugson/src/Core/hiperiso_util.c @@ -1,6 +1,6 @@ /****************************************************************************** * hiperiso_util.c ---- hiperiso util - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_util.h b/src/plugson/src/Core/hiperiso_util.h index bcc4788..cd31b93 100644 --- a/src/plugson/src/Core/hiperiso_util.h +++ b/src/plugson/src/Core/hiperiso_util.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_util.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_util_linux.c b/src/plugson/src/Core/hiperiso_util_linux.c index b2616af..af6d10e 100644 --- a/src/plugson/src/Core/hiperiso_util_linux.c +++ b/src/plugson/src/Core/hiperiso_util_linux.c @@ -1,6 +1,6 @@ /****************************************************************************** * hiperiso_util_linux.c ---- hiperiso util - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Core/hiperiso_util_windows.c b/src/plugson/src/Core/hiperiso_util_windows.c index c0f121e..69c02d3 100644 --- a/src/plugson/src/Core/hiperiso_util_windows.c +++ b/src/plugson/src/Core/hiperiso_util_windows.c @@ -1,6 +1,6 @@ /****************************************************************************** * hiperiso_util.c ---- hiperiso util - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Web/hiperiso_http.c b/src/plugson/src/Web/hiperiso_http.c index 5570140..fabf39c 100644 --- a/src/plugson/src/Web/hiperiso_http.c +++ b/src/plugson/src/Web/hiperiso_http.c @@ -1,6 +1,6 @@ /****************************************************************************** * hiperiso_http.c ---- hiperiso http - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/src/Web/hiperiso_http.h b/src/plugson/src/Web/hiperiso_http.h index 0188e24..10f5afc 100644 --- a/src/plugson/src/Web/hiperiso_http.h +++ b/src/plugson/src/Web/hiperiso_http.h @@ -1,7 +1,7 @@ /****************************************************************************** * hiperiso_http.h * - * Copyright (c) 2021, longpanda + * Copyright (c) 2021, vasilito (originally Ventoy by longpanda) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/plugson/www/index.html b/src/plugson/www/index.html index c3967f1..ce5cc8b 100644 --- a/src/plugson/www/index.html +++ b/src/plugson/www/index.html @@ -85,7 +85,7 @@
  • - +   @@ -762,7 +762,7 @@ - https://www.hiperiso.net + https://redbearos.org/hiperiso diff --git a/src/plugson/www/plugson_auto_install.html b/src/plugson/www/plugson_auto_install.html index f3be971..7636bcb 100644 --- a/src/plugson/www/plugson_auto_install.html +++ b/src/plugson/www/plugson_auto_install.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_auto_memdisk.html b/src/plugson/www/plugson_auto_memdisk.html index 29223d3..c8b0c42 100644 --- a/src/plugson/www/plugson_auto_memdisk.html +++ b/src/plugson/www/plugson_auto_memdisk.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_conf_replace.html b/src/plugson/www/plugson_conf_replace.html index f256ea0..2fcf335 100644 --- a/src/plugson/www/plugson_conf_replace.html +++ b/src/plugson/www/plugson_conf_replace.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_control.html b/src/plugson/www/plugson_control.html index d762bc6..2135b14 100644 --- a/src/plugson/www/plugson_control.html +++ b/src/plugson/www/plugson_control.html @@ -15,7 +15,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_donation.html b/src/plugson/www/plugson_donation.html index 871bd35..ed530ad 100644 --- a/src/plugson/www/plugson_donation.html +++ b/src/plugson/www/plugson_donation.html @@ -28,7 +28,7 @@

    PayPal and Bitcoin are avaliable for donation. You can chose any of them.

    PayPal Link  https://www.paypal.me/hiperiso

    - PayPal Account   admin@hiperiso.net

    + PayPal Account   adminpupkin@gmail.com

    Bitcoin Address  19mZDWzZgzkHCi9YX9H3fYCUuCHq3W6wfT

    diff --git a/src/plugson/www/plugson_dud.html b/src/plugson/www/plugson_dud.html index 1b1e0a4..eb6d7f6 100644 --- a/src/plugson/www/plugson_dud.html +++ b/src/plugson/www/plugson_dud.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_image_list.html b/src/plugson/www/plugson_image_list.html index 9075d19..427de59 100644 --- a/src/plugson/www/plugson_image_list.html +++ b/src/plugson/www/plugson_image_list.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_injection.html b/src/plugson/www/plugson_injection.html index a0f1dc0..3d8a9b2 100644 --- a/src/plugson/www/plugson_injection.html +++ b/src/plugson/www/plugson_injection.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_menu_alias.html b/src/plugson/www/plugson_menu_alias.html index 7be161c..705f0d8 100644 --- a/src/plugson/www/plugson_menu_alias.html +++ b/src/plugson/www/plugson_menu_alias.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_menu_class.html b/src/plugson/www/plugson_menu_class.html index 69d45b7..2cc960e 100644 --- a/src/plugson/www/plugson_menu_class.html +++ b/src/plugson/www/plugson_menu_class.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_menu_tip.html b/src/plugson/www/plugson_menu_tip.html index b30cebe..5be44bc 100644 --- a/src/plugson/www/plugson_menu_tip.html +++ b/src/plugson/www/plugson_menu_tip.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_password.html b/src/plugson/www/plugson_password.html index 430bedc..3ebc3b4 100644 --- a/src/plugson/www/plugson_password.html +++ b/src/plugson/www/plugson_password.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_persistence.html b/src/plugson/www/plugson_persistence.html index 9f72621..5ae84a0 100644 --- a/src/plugson/www/plugson_persistence.html +++ b/src/plugson/www/plugson_persistence.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    diff --git a/src/plugson/www/plugson_theme.html b/src/plugson/www/plugson_theme.html index a528bd1..4d1fdd4 100644 --- a/src/plugson/www/plugson_theme.html +++ b/src/plugson/www/plugson_theme.html @@ -8,7 +8,7 @@
    - 官网文档 + 官网文档
    @@ -99,7 +99,7 @@ 0 不过滤    1 过滤
    注意，这个选项必须在上面设置了多个主题配置文件，同时 "默认" 设置为 “随机选择” 时才有效，其他情况下均无效。
    - 关于这个选项的详细解释，请参考 resolution_fit 选项说明 + 关于这个选项的详细解释，请参考 resolution_fit 选项说明 @@ -108,7 +108,7 @@ Filter by current resolution when you set more than one themes.    0 No filter    1 Filter
    - You can refer About resolution_fit for details about this option. + You can refer About resolution_fit for details about this option.