From 8e3da65433fad8e39143f323e31a0e7a32f88bda Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Tue, 12 Dec 2023 11:04:02 +0100 Subject: [PATCH] Added missing bat --- client/install_modules.bat | 1 + installer/olympus.iss | 9 +++++---- node/install_modules.bat | 2 +- package.bat | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 client/install_modules.bat diff --git a/client/install_modules.bat b/client/install_modules.bat new file mode 100644 index 00000000..b13074ad --- /dev/null +++ b/client/install_modules.bat @@ -0,0 +1 @@ +call npm install --omit=dev \ No newline at end of file diff --git a/installer/olympus.iss b/installer/olympus.iss index e658e861..06956391 100644 --- a/installer/olympus.iss +++ b/installer/olympus.iss @@ -15,6 +15,7 @@ SetupIconFile="..\img\olympus.ico" DirExistsWarning=no AppendDefaultDirName=no LicenseFile="..\LEGAL" +ChangesEnvironment=yes [Messages] WizardSelectDir=Select the location of DCS's Saved Games folder @@ -65,14 +66,14 @@ Source: "..\prerequisites\node-v20.10.0-x64.msi"; DestDir: "{app}\Mods\Services\ #endif [Run] -Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\node"; Parameters: configurator.js -a {code:GetAddress} -c {code:GetClientPort} -b {code:GetBackendPort} -p {code:GetPassword} --bp {code:GetBluePassword} --rp {code:GetRedPassword}; Check: CheckCallConfigurator; Flags: runhidden; -Filename: "{app}\Mods\Services\Olympus\node\install_modules.bat"; WorkingDir:"{app}\Mods\Services\Olympus\node"; -Filename: "{app}\Mods\Services\Olympus\client\install_modules.bat"; WorkingDir:"{app}\Mods\Services\Olympus\client"; - #ifdef Node Filename: "msiexec.exe"; Parameters: "/i ""{app}\Mods\Services\Olympus\temp\node-v20.10.0-x64.msi"" /qb"; WorkingDir: {tmp}; #endif +Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\node"; Parameters: configurator.js -a {code:GetAddress} -c {code:GetClientPort} -b {code:GetBackendPort} -p {code:GetPassword} --bp {code:GetBluePassword} --rp {code:GetRedPassword}; Check: CheckCallConfigurator; Flags: runhidden; +Filename: "{app}\Mods\Services\Olympus\node\install_modules.bat"; WorkingDir:"{app}\Mods\Services\Olympus\node"; +Filename: "{app}\Mods\Services\Olympus\client\install_modules.bat"; WorkingDir:"{app}\Mods\Services\Olympus\client"; + [Icons] Name: "{userdesktop}\DCS Olympus Client"; Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\client"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus.ico"; Check: CheckLocalInstall; Parameters: "run_client.js"; Flags: runminimized; Name: "{userdesktop}\DCS Olympus Server"; Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\client"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus_server.ico"; Parameters: ".\bin\www"; diff --git a/node/install_modules.bat b/node/install_modules.bat index ed44a81b..efaeb988 100644 --- a/node/install_modules.bat +++ b/node/install_modules.bat @@ -1 +1 @@ -start /min npm install yargs prompt-sync sha256 tcp-ping-port +call npm install yargs prompt-sync sha256 tcp-ping-port diff --git a/package.bat b/package.bat index 1d9112d4..5932cf9e 100644 --- a/package.bat +++ b/package.bat @@ -1,2 +1,2 @@ -call "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "installer\olympus.iss" -call "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "installer\olympus.iss" \DNode +call "C:\Program Files (x86)\Inno Setup 6\iscc.exe" installer\olympus.iss +call "C:\Program Files (x86)\Inno Setup 6\iscc.exe" installer\olympus.iss /DNode