新版 i4j launcher

PBH-BTN · Dec 2, 2024 · ec0d34a · ec0d34a
1 parent 692f3b4
commit ec0d34a
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 16 deletions.
diff --git a/install4j/lang/custom.utf8 b/install4j/lang/custom.utf8
@@ -1,7 +1,8 @@
 launcher.peerbanhelper.gui=PeerBanHelper
-launcher.peerbanhelper.gui.swing=PeerBanHelper(兼容模式)
-launcher.peerbanhelper.nogui=PeerBanHelper(无GUI, 控制台)
-launcher.peerbanhelper.service=PeerBanHelper(服务)
+launcher.peerbanhelper.silent=PeerBanHelper (静默启动)
+launcher.peerbanhelper.nogui=PeerBanHelper (无GUI, 控制台)
+launcher.peerbanhelper.service=PeerBanHelper (服务)
+launcher.peerbanhelper.updater=PeerBanHelper 检查更新
 checkbox.followsystemstartup=登录时自动启动到系统托盘
 peerbanhelper.description=PeerBanHelper
 checkbox.registersystemservice=注册为系统服务(除非你知道这是做什么的，否则不要选中)

diff --git a/install4j/lang/en-US.utf8 b/install4j/lang/en-US.utf8
@@ -1,7 +1,8 @@
 launcher.peerbanhelper.gui=PeerBanHelper
-launcher.peerbanhelper.gui.swing=PeerBanHelper(Compatibility Mode)
-launcher.peerbanhelper.nogui=PeerBanHelper(NoGUI, Console)
-launcher.peerbanhelper.service=PeerBanHelper(Service)
+launcher.peerbanhelper.gui.swing=PeerBanHelper (Compatibility Mode)
+launcher.peerbanhelper.nogui=PeerBanHelper (NoGUI, Console)
+launcher.peerbanhelper.service=PeerBanHelper (Service)
+launcher.peerbanhelper.updater=PeerBanHelper Updater
 checkbox.followsystemstartup=Boot automatically to the system tray when logged in
 peerbanhelper.description=PeerBanHelper
 checkbox.registersystemservice=Register as system service (DO NOT CHECK UNLESS YOU KNOW WHAT YOU'RE DOING)

diff --git a/install4j/lang/zh-CN.utf8 b/install4j/lang/zh-CN.utf8
@@ -1,6 +1,7 @@
 launcher.peerbanhelper.gui=PeerBanHelper
-launcher.peerbanhelper.gui.swing=PeerBanHelper(兼容模式)
-launcher.peerbanhelper.nogui=PeerBanHelper(无GUI, 控制台)
-launcher.peerbanhelper.service=PeerBanHelper(服务)
+launcher.peerbanhelper.silent=PeerBanHelper (静默启动)
+launcher.peerbanhelper.nogui=PeerBanHelper (无GUI, 控制台)
+launcher.peerbanhelper.service=PeerBanHelper (服务)
+launcher.peerbanhelper.updater=PeerBanHelper 检查更新
 checkbox.followsystemstartup=登录到桌面时自动启动
 peerbanhelper.description=一个能够自动封禁不受欢迎、吸血和异常的 Peers，并支持自定义规则的 BT 客户端辅助工具
diff --git a/install4j/project.install4j b/install4j/project.install4j
@@ -23,12 +23,9 @@
       <dirEntry mountPoint="24" file="${compiler:librariesPath}" entryMode="subdir" subDirectory="libraries" />
       <variableEntry mountPoint="24" name="jarPath" />
     </entries>
-    <components>
-      <component name="IPFS Kubo Client" id="229" downloadable="true" />
-    </components>
   </files>
   <launchers>
-    <launcher name="PeerBanHelper" id="26" checkUpdater="true">
+    <launcher name="PeerBanHelper" id="26" menuName="${i18n:launcher.peerbanhelper.gui}" checkUpdater="true">
       <executable name="PeerBanHelper-GUI" iconSet="true" executableDir="." redirectStdout="true" executableMode="gui" changeWorkingDirectory="false" singleInstance="true" checkConsoleParameter="true">
         <versionInfo include="true" fileDescription="${i18n:peerbanhelper.description}" legalCopyright="PBH-BTN Community - Licensed under GPLv3 licenses. https://www.gnu.org/licenses/quick-guide-gplv3.en.html" internalName="peerbanhelper" />
       </executable>
@@ -42,7 +39,7 @@
         <file path="./icon.png" />
       </iconImageFiles>
     </launcher>
-    <launcher name="PeerBanHelper GUI Silent" id="66" checkUpdater="true">
+    <launcher name="PeerBanHelper GUI Silent" id="66" menuName="${i18n:launcher.peerbanhelper.silent}" checkUpdater="true">
       <executable name="PeerBanHelper-GUI-Silent" iconSet="true" executableDir="." redirectStdout="true" executableMode="gui" singleInstance="true" checkConsoleParameter="true">
         <versionInfo include="true" fileDescription="${i18n:peerbanhelper.description}" legalCopyright="PBH-BTN Community - Licensed under GPLv3 licenses. https://www.gnu.org/licenses/quick-guide-gplv3.en.html" internalName="peerbanhelper" />
       </executable>
@@ -56,7 +53,7 @@
         <file path="./icon.png" />
       </iconImageFiles>
     </launcher>
-    <launcher name="PeerBanHelper NoGUI" id="28" swtApp="true" checkUpdater="true">
+    <launcher name="PeerBanHelper NoGUI" id="28" menuName="${i18n:launcher.peerbanhelper.nogui}" swtApp="true" checkUpdater="true">
       <executable name="PeerBanHelper-NoGUI" iconSet="true" executableDir="." redirectStderr="false" executableMode="console" singleInstance="true" checkConsoleParameter="true">
         <versionInfo include="true" fileDescription="${i18n:peerbanhelper.description}" legalCopyright="PBH-BTN Community - Licensed under GPLv3 licenses. https://www.gnu.org/licenses/quick-guide-gplv3.en.html" internalName="peerbanhelper" />
       </executable>
@@ -84,6 +81,21 @@
         <file path="./icon.png" />
       </iconImageFiles>
     </launcher>
+    <launcher name="PeerBanHelper-Updater" id="235" menuName="${i18n:launcher.peerbanhelper.updater}">
+      <executable name="PeerBanHelper-Updater" iconSet="true" executableDir="." failOnStderrOutput="false" executableMode="gui" singleInstance="true" checkConsoleParameter="true">
+        <versionInfo include="true" fileDescription="${i18n:peerbanhelper.description}" legalCopyright="PBH-BTN Community - Licensed under GPLv3 licenses. https://www.gnu.org/licenses/quick-guide-gplv3.en.html" internalName="peerbanhelper" />
+      </executable>
+      <java mainClass="com.ghostchu.peerbanhelper.MainEmpty" vmParameters="-Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Dlauncher.directory=${launcher:sys.launcherDirectory}">
+        <classPath>
+          <scanDirectory location="libraries" failOnError="false" />
+          <archive location="PeerBanHelper.jar" failOnError="false" />
+        </classPath>
+      </java>
+      <iconImageFiles>
+        <file path="" />
+        <file path="./updater.png" />
+      </iconImageFiles>
+    </launcher>
   </launchers>
   <installerGui autoUpdateDescriptorUrl="https://pbh-files.pbh-btn.com/updates/latest/updates.xml">
     <applications>
@@ -721,7 +733,7 @@ file.getParent() != null || (file.getName().endsWith(".app") &amp;&amp; director
           </screen>
         </startup>
       </application>
-      <application name="Standalone update downloader" id="167" beanClass="com.install4j.runtime.beans.applications.CustomApplication" launchInNewProcess="false">
+      <application name="Standalone update downloader" id="167" beanClass="com.install4j.runtime.beans.applications.CustomApplication" automaticLauncherIntegration="true" launchMode="startupSync" launchInNewProcess="false" launchSchedule="always" allLaunchers="false">
         <serializedBean>
           <property name="customIconImageFiles">
             <add>
@@ -754,6 +766,9 @@ file.getParent() != null || (file.getName().endsWith(".app") &amp;&amp; director
           <property name="useCustomIcon" type="boolean" value="true" />
           <property name="windowTitle" type="string">${i18n:updater.WindowTitle("${compiler:sys.fullName}")}</property>
         </serializedBean>
+        <launcherIds>
+          <launcher id="235" />
+        </launcherIds>
         <startup>
           <screen id="168" beanClass="com.install4j.runtime.beans.screens.StartupScreen" rollbackBarrierExitCode="0" />
         </startup>
@@ -1589,4 +1604,7 @@ return true;</property>
       <jreBundle platform="alpine-linux-aarch64" installOnlyIfNecessary="true" />
     </unixInstaller>
   </mediaSets>
+  <buildIds>
+    <mediaSet refId="38" />
+  </buildIds>
 </install4j>
diff --git a/install4j/updater.png b/install4j/updater.png
diff --git a/src/main/java/com/ghostchu/peerbanhelper/MainEmpty.java b/src/main/java/com/ghostchu/peerbanhelper/MainEmpty.java
@@ -0,0 +1,7 @@
+package com.ghostchu.peerbanhelper;
+
+public class MainEmpty {
+    public static void main(String[] args) {
+        // 什么都不做直接退出
+    }
+}