From f13545eae981d99f51b86ffd28c73b3b49a64d6c Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Tue, 5 Mar 2024 00:27:35 +0100 Subject: [PATCH] Edited installation message, fixed dev environment for server --- frontend/server/.vscode/launch.json | 3 ++- frontend/server/.vscode/tasks.json | 7 +++++++ scripts/batch/install.bat | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/server/.vscode/launch.json b/frontend/server/.vscode/launch.json index 7b401894..c5c4d9ed 100644 --- a/frontend/server/.vscode/launch.json +++ b/frontend/server/.vscode/launch.json @@ -12,7 +12,8 @@ "/**" ], "args": ["--config", "${input:enterDir}/Config/olympus.json"], - "program": "./bin/www" + "program": "./bin/www", + "preLaunchTask": "copy" }, { "type": "node", diff --git a/frontend/server/.vscode/tasks.json b/frontend/server/.vscode/tasks.json index 6b76fb4f..f71a20f2 100644 --- a/frontend/server/.vscode/tasks.json +++ b/frontend/server/.vscode/tasks.json @@ -25,6 +25,13 @@ "endsPattern": "Waiting for connections..." } } + }, + { + "label": "copy", + "type": "shell", + "command": "./scripts/copy.bat", + "isBackground": false, + "dependsOn": ["check-setup"], } ], "inputs": [ diff --git a/scripts/batch/install.bat b/scripts/batch/install.bat index d703df57..a01c9096 100644 --- a/scripts/batch/install.bat +++ b/scripts/batch/install.bat @@ -9,7 +9,7 @@ echo "* |_____/ \_____|_____/ \____/|_|\__, |_| |_| |_| .__/ \__,_|___/ * echo "* __/ | | | *" echo "* |___/ |_| *" echo "*********************************************************************" -echo Welcome to the DCS Olympus {{OLYMPUS_VERSION_NUMBER}} installation script. Please wait while the necessary dependencies are installed! +echo Welcome to the DCS Olympus {{OLYMPUS_VERSION_NUMBER}} installation script. Please wait while the necessary dependencies are downloaded and installed! NOTE: Depending on your internet speed this may take a while, or it may look like the installation is hanged. Don't worry! echo: