Merge pull request #803 from Pax1601/manager-wizard

Made instructions clearer and removed folder deletion on update

INSTRUCTIONS.txt

@@ -15,28 +15,30 @@ INSTALLATION INSTRUCTIONS
 1) Close any applications which may interfere with installation, including Digital Combat Simulator (DCS) and previous versions of Olympus.
 
 2) If you DO NOT have Olympus already installed, SKIP THIS STEP. If you have already installed Olympus, do the following:
-    NOTE: If you made any changes to your unit databases or mods.lua file (e.g. to support a third party mod) make a backup of the edited files before proceeding or changes will be lost;
-    a) If you installed DCS Olympus v1.0.3 using the installer, simply remove it using Windows's "Add or remove programs" application. 
-    b) If you installed DCS Olympus v1.0.3 using the archived version, remove it by deleting the "...<DCS Saved Games folder>\Mods\Services\Olympus" folder. Do this for every DCS instance you installed Olympus in. 
-       Remember to delete any shortcuts you created. Don't worry, they will be created automatically again by the installation script provided in this package.
+    	NOTE: If you made any changes to your unit databases or mods.lua file (e.g. to support a third party mod) make a backup of the edited files before proceeding or changes will be lost;
+    	a) If you installed DCS Olympus v1.0.3 using the installer, simply remove it using Windows's "Add or remove programs" application. 
+    	b) If you installed DCS Olympus v1.0.3 using the archived version, remove it by deleting the "...<DCS Saved Games folder>\Mods\Services\Olympus" folder. Do this for every DCS instance you installed Olympus in. 
+       	   Remember to delete any shortcuts you created. Don't worry, they will be created automatically again by the installation script provided in this package.
 
-3) Extract all the contents of the DCS Olympus {{OLYMPUS_VERSION_NUMBER}} archive in your "Saved Games" folder (NOTE: not your DCS Saved Games folder). 
-    NOTE: Unlike previous version of Olympus, it is no longer necessary to copy the archived files into each DCS instance folder.
+3) Create a folder named "DCS Olympus" in your "Saved Games" directory and extract all the contents of the downloaded archive into it.
+	NOTE:
+    	a) Do not extract the contents of the archive directly in your Saved Games folder or in your DCS Saved Games folder. 
+        b) Unlike previous version of Olympus, it is no longer necessary to copy the archived files into each DCS instance folder.
 
-3) Execute the "installer.bat" script by double-clicking on it. Wait for the installation script to complete. Installation may take a couple of minutes, after which the Manager will start automatically.
+4) Execute the "installer.bat" script by double-clicking on it. It is located in the folder you created in step 3. Wait for the installation script to complete. Installation may take a couple of minutes, after which the Manager will start automatically.
 	NOTE: depending on your Windows configuration, the script may be called "installer" (without .bat at the end).
 
-4) The Olympus Manager will open. This will allow you to add/remove Olympus to individual DCS instances.
+5) The Olympus Manager will open. This will allow you to add/remove Olympus to individual DCS instances.
 	Use the Olympus Manager and follow the instructions to install and setup Olympus.
 
-5) Start DCS and run a mission. Make sure it is UNPAUSED.
+6) Start DCS and run a mission. Make sure it is UNPAUSED.
 
-6) Open Olympus via the shortcut and login using any username and the Game Master password set using the Manager. (NOTE: not your DCS server password).
+7) Open Olympus via the shortcut and login using any username and the Game Master password set using the Manager. (NOTE: not your DCS server password).
 	Local installation: run the client from the provided desktop shortcut or start it using the "View and manage instances" page of the Manager. 
 	Dedicated server: users must first start the Olympus server from the provided desktop shortcut or using the "View and manage instances" page of the Manager. 
 			  Then log in using any browser and visiting "http:\\<server IP>:<client port>" (client port is 3000 by default, but can be edited using the Manager)
 
-7) You can use the manager at any time to change the ports and/or passwords. If you do, REMEMBER TO RESTART OLYMPUS AND DCS.
+8) You can use the manager at any time to change the ports and/or passwords. If you do, REMEMBER TO RESTART OLYMPUS AND DCS.
 
 
 NOTES:

manager/javascripts/preload.js

@@ -188,7 +188,7 @@ function extractAndCopy(folder) {
     4) cds into the new installation;
     5) runs the installer.bat script */
     fs.writeFileSync(path.join(folder, 'update.bat'),
-        `timeout /t 5 \nrmdir "${path.join(__dirname, "..", "..")}" /s /q \necho D|xcopy /Y /S /E "${path.join(folder, "temp")}" "${path.join(__dirname, "..", "..")}" \ncd "${path.join(__dirname, "..", "..")}" \ncall installer.bat`
+        `timeout /t 5 \necho D|xcopy /Y /S /E "${path.join(folder, "temp")}" "${path.join(__dirname, "..", "..")}" \ncd "${path.join(__dirname, "..", "..")}" \ncall installer.bat`
     )
 
     /* Launch the update script then close gracefully */