From 4b11eb2b53bd2fcfada2622f80b6d01169223542 Mon Sep 17 00:00:00 2001
From: Youngster_yj <907985037@qq.com>
Date: Thu, 28 Mar 2024 14:43:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E7=89=88=E6=9C=AC=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: 自定义安装版本增加
---
 build/yakit_build.nsh                 | 13 ++++++++++---
 multibuilder/electron-builder-se.yaml |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build/yakit_build.nsh b/build/yakit_build.nsh
index f1fa9d496b..2986e8a355 100644
--- 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
index 3e564b9498..368b839927 100644
--- 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