Installer fixes

mh-cad · Jun 22, 2020 · 04adb24 · 04adb24
1 parent a2d12be
commit 04adb24
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/NSIS Installer/vt-installer.nsi b/NSIS Installer/vt-installer.nsi
@@ -8,8 +8,8 @@
 ;General
 
   ;Name and file
-  Name "VisTarsier"
-  OutFile "VTSetup.exe"
+  Name "VisTarsier 2.0"
+  OutFile "VTSetup_2.exe"
 
   ;Default installation folder
   InstallDir "$EXEDIR\VisTarsier"
@@ -72,6 +72,7 @@ Section "VisTarsierService" SecService
   WriteUninstaller "$INSTDIR\Uninstall.exe"
 
   ExecWait '$INSTDIR\installers\dotnet.exe'
+  ExecWait '$INSTDIR\installers\vcredist_x64.exe'
   ExecWait '"$INSTDIR\service\VisTarsier.ConfigApp.exe"'
 
   ;---------------------------------------------------------------------------

diff --git a/VisTarsier.ConfigApp/MainWindow.xaml.cs b/VisTarsier.ConfigApp/MainWindow.xaml.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -283,9 +284,9 @@ private void Button_Click(object sender, RoutedEventArgs e)
             {
                 var confJS = new string[]
                 {
-                    $"exports.LOG_PATH = '{nodeDir}' + '../../log/log.txt';",
-                    $"exports.DEFAULT_RECIPE = '{nodeDir}' + default.recipe.json';",
-                    $"exports.MANUAL_CASE_PATH = '{nodeDir}' + '../cases/manual';",
+                    $"exports.LOG_PATH = '{System.IO.Path.GetFullPath(System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "../log/log.txt")).Replace(@"\", @"\\")}';",
+                    $"exports.DEFAULT_RECIPE = '{nodeDir.Replace(@"\", @"\\")}' + 'default.recipe.json';",
+                    $"exports.MANUAL_CASE_PATH = '{(System.IO.Path.GetFullPath(System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "../cases/manual")).Replace(@"\", @"\\"))}';",
                     $"exports.SQL_CONFIG =",
                     "    {",
                     $"        user: '{txtDBUser.Text}',",

diff --git a/VisTarsier.Service/VisTarsier.Service.csproj b/VisTarsier.Service/VisTarsier.Service.csproj
@@ -63,7 +63,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>VisTarsier.Service.Program</StartupObject>