From 228452fd1773143514287f76ed4ce3b1183e6130 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Tue, 12 Dec 2023 17:34:43 +0100 Subject: [PATCH] More installer upgrades --- {node => client}/configurator.js | 0 {node => client}/install.bat | 0 installer/archive/INSTRUCTIONS.txt | 16 ++++++++++++++++ installer/installer/INSTRUCTIONS.txt | 16 ++++++++++++++++ installer/olympus.iss | 11 ++++++----- node/.vscode/launch.json | 17 ----------------- 6 files changed, 38 insertions(+), 22 deletions(-) rename {node => client}/configurator.js (100%) rename {node => client}/install.bat (100%) create mode 100644 installer/archive/INSTRUCTIONS.txt create mode 100644 installer/installer/INSTRUCTIONS.txt delete mode 100644 node/.vscode/launch.json diff --git a/node/configurator.js b/client/configurator.js similarity index 100% rename from node/configurator.js rename to client/configurator.js diff --git a/node/install.bat b/client/install.bat similarity index 100% rename from node/install.bat rename to client/install.bat diff --git a/installer/archive/INSTRUCTIONS.txt b/installer/archive/INSTRUCTIONS.txt new file mode 100644 index 00000000..0332809b --- /dev/null +++ b/installer/archive/INSTRUCTIONS.txt @@ -0,0 +1,16 @@ + _____ _____ _____ ____ _ + | __ \ / ____|/ ____| / __ \| | + | | | | | | (___ | | | | |_ _ _ __ ___ _ __ _ _ ___ + | | | | | \___ \ | | | | | | | | '_ ` _ \| '_ \| | | / __| + | |__| | |____ ____) | | |__| | | |_| | | | | | | |_) | |_| \__ \ + |_____/ \_____|_____/ \____/|_|\__, |_| |_| |_| .__/ \__,_|___/ + __/ | | | + |___/ |_| + +v1.0.2 + +INSTALLATION INSTRUCTIONS + +1) install node.js by running the node-v20.10.0-x64.msi installer (NOTE: Feel free to check the settings, provided you do not prevent it from keeping the add to path option. You can click straight through the pages without changes if you wish, and it will install correctly.); +2) install DCS Olympus by copying the Mods and Scripts folder into your DCS Saved Games folder (by default \Saved Games\dcs.openbeta); +3) enjoy! \ No newline at end of file diff --git a/installer/installer/INSTRUCTIONS.txt b/installer/installer/INSTRUCTIONS.txt new file mode 100644 index 00000000..b0948fe7 --- /dev/null +++ b/installer/installer/INSTRUCTIONS.txt @@ -0,0 +1,16 @@ + _____ _____ _____ ____ _ + | __ \ / ____|/ ____| / __ \| | + | | | | | | (___ | | | | |_ _ _ __ ___ _ __ _ _ ___ + | | | | | \___ \ | | | | | | | | '_ ` _ \| '_ \| | | / __| + | |__| | |____ ____) | | |__| | | |_| | | | | | | |_) | |_| \__ \ + |_____/ \_____|_____/ \____/|_|\__, |_| |_| |_| .__/ \__,_|___/ + __/ | | | + |___/ |_| + +v1.0.2 + +INSTALLATION INSTRUCTIONS + +1) install node.js by running the node-v20.10.0-x64.msi installer (NOTE: Feel free to check the settings, provided you do not prevent it from keeping the add to path option. You can click straight through the pages without changes if you wish, and it will install correctly.); +2) install DCS Olympus by running the provided installer; +3) enjoy! \ No newline at end of file diff --git a/installer/olympus.iss b/installer/olympus.iss index 9d51abca..492a00e2 100644 --- a/installer/olympus.iss +++ b/installer/olympus.iss @@ -46,8 +46,8 @@ Source: "..\client\demo.js"; DestDir: "{app}\Mods\Services\Olympus\client"; Flag Source: "..\client\package.json"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion; Source: "..\client\run_client.js"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion; -Source: "..\node\configurator.js"; DestDir: "{app}\Mods\Services\Olympus\node"; Flags: ignoreversion; -Source: "..\node\install.bat"; DestDir: "{app}\Mods\Services\Olympus\node"; Flags: ignoreversion; +Source: "..\client\configurator.js"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion; +Source: "..\client\install.bat"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion; Source: "..\img\olympus.ico"; DestDir: "{app}\Mods\Services\Olympus\img"; Flags: ignoreversion; Source: "..\img\olympus_server.ico"; DestDir: "{app}\Mods\Services\Olympus\img"; Flags: ignoreversion; @@ -57,15 +57,16 @@ Source: "..\img\configurator_logo.png"; DestDir: "{app}\Mods\Services\Olympus\im Source: "..\LEGAL"; DestDir: "{app}\Mods\Services\Olympus"; Flags: ignoreversion; [Run] -Filename: "{app}\Mods\Services\Olympus\node\install.bat"; WorkingDir:"{app}\Mods\Services\Olympus\client"; Flags: runhidden; StatusMsg: "Installing node.js modules, this may take some time..."; -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; StatusMsg: "Applying configuration..."; +Filename: "{app}\Mods\Services\Olympus\client\install.bat"; WorkingDir:"{app}\Mods\Services\Olympus\client"; Flags: runhidden; StatusMsg: "Installing node.js modules, this may take some time..."; +Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\client"; 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; StatusMsg: "Applying configuration..."; [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"; -Name: "{userdesktop}\DCS Olympus Configurator"; Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\node"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus_configurator.ico"; Check: CheckServerInstall; Parameters: "configurator.js"; +Name: "{userdesktop}\DCS Olympus Configurator"; Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\client"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus_configurator.ico"; Check: CheckServerInstall; Parameters: "configurator.js"; Name: "{app}\Mods\Services\Olympus\DCS Olympus Client"; Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\client"; IconFilename: "{app}\Mods\Services\Olympus\img\olympus.ico"; Check: CheckLocalInstall; Parameters: "run_client.js"; Flags: runminimized; Name: "{app}\Mods\Services\Olympus\DCS Olympus Server"; Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\client"; IconFilename: "{app}\Mods\Services\Olympus\img\olympus_server.ico"; Parameters: ".\bin\www"; +Name: "{app}\Mods\Services\Olympus\DCS Olympus Configurator"; Filename: "node.exe"; WorkingDir:"{app}\Mods\Services\Olympus\client"; IconFilename: "{app}\Mods\Services\Olympus\img\olympus_configurator.ico"; Check: CheckServerInstall; Parameters: "configurator.js"; [UninstallDelete] Type: filesandordirs; Name: "{app}\Mods\Services\Olympus" diff --git a/node/.vscode/launch.json b/node/.vscode/launch.json deleted file mode 100644 index a091f314..00000000 --- a/node/.vscode/launch.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "node", - "request": "launch", - "name": "Launch Program", - "skipFiles": [ - "/**" - ], - "program": "${workspaceFolder}\\run_client.js" - } - ] -} \ No newline at end of file