fix: 自定义安装版本增加

yaklang · Mar 28, 2024 · 4b11eb2 · 4b11eb2
1 parent 4878a4c
commit 4b11eb2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/build/yakit_build.nsh b/build/yakit_build.nsh
@@ -101,6 +101,12 @@ FunctionEnd
         ${If} $0 != "" ; ee
             StrCpy $INSTALL_PATH_REG_KEY_NAME "EnpriTrace_InstallPath"
             StrCpy $EXE_NAME "EnpriTrace"
+        ${Else}
+            ${StrStr} $0 $EXEFILE "单兵武器装备库"
+            ${If} $0 != "" ; ee
+                StrCpy $INSTALL_PATH_REG_KEY_NAME "Dianxin_InstallPath"
+                StrCpy $EXE_NAME "单兵武器装备库"
+            ${EndIf}
         ${EndIf}
     ${EndIf}
 
@@ -118,11 +124,12 @@ FunctionEnd
     ${If} ${FileExists} `$INSTDIR\EnpriTraceAgent.exe` ; se 
         StrCpy $INSTALL_PATH_REG_KEY_NAME "EnpriTraceAgent_InstallPath"
         StrCpy $EXE_NAME "EnpriTraceAgent"
-    ${Else}
-        ${If} ${FileExists} `$INSTDIR\EnpriTrace.exe` ; ee 
+    ${ElseIf} ${FileExists} `$INSTDIR\EnpriTrace.exe` ; ee 
             StrCpy $INSTALL_PATH_REG_KEY_NAME "EnpriTrace_InstallPath"
             StrCpy $EXE_NAME "EnpriTrace"
-        ${EndIf}
+    ${ElseIf} ${FileExists} `$INSTDIR\单兵武器装备库.exe` ; dianxin 
+            StrCpy $INSTALL_PATH_REG_KEY_NAME "Dianxin_InstallPath"
+            StrCpy $EXE_NAME "单兵武器装备库"
     ${EndIf}
 
     !insertmacro checkInstalled

diff --git a/multibuilder/electron-builder-se.yaml b/multibuilder/electron-builder-se.yaml
@@ -87,8 +87,8 @@ nsis:
   perMachine: false
   deleteAppDataOnUninstall: true
   allowToChangeInstallationDirectory: true 
-  installerIcon: app/assets/yakitselogo.ico 
-  uninstallerIcon: app/assets/yakitselogo.ico 
+  installerIcon: app/assets/telecom_logo_small.ico 
+  uninstallerIcon: app/assets/telecom_logo_small.ico 
   unicode: true
   include: build/yakit_build.nsh
   license: LICENSE.md