Merge pull request #66 from IUrreta/main

Main
IUrreta · Aug 16, 2023 · 5c5db6a · 5c5db6a
2 parents d13ee09 + 519c2fd
commit 5c5db6a
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 11 deletions.
diff --git a/front/js/renderer.js b/front/js/renderer.js
@@ -13,7 +13,7 @@ socket.onopen = () => {
 };
 
 const versionPanel = document.querySelector('.versionPanel');
-fetch('./../launcher/version.conf')
+fetch('./../version.conf')
 .then(response => response.text())
 .then(version => {
     versionPanel.textContent = `${version}`;

diff --git a/launcher/kill.bat → kill.bat b/launcher/kill.bat → kill.bat
diff --git a/launcher/launch.bat → launch.bat b/launcher/launch.bat → launch.bat
@@ -1,14 +1,8 @@
 @echo off
 REM Ejecutar server.py en la carpeta "back" usando Python
 
-for %%I in ("%CD%") do set "last_folder=%%~nI"
-if "%last_folder%"=="DatabaseEditor" (
-    cd launcher
-)
-
 set /p version=<version.conf
 echo Version: %version%
-cd ..
 
 cd back
 pip install websockets

diff --git a/launcher/version.conf b/launcher/version.conf
diff --git a/restart.vbs b/restart.vbs
@@ -1,3 +1,3 @@
 Set WshShell = CreateObject("WScript.Shell")
-WshShell.Run "launcher\kill.bat", 0, True
-WshShell.Run "launcher\launch.bat", 0, True
+WshShell.Run "kill.bat", 0, True
+WshShell.Run "launch.bat", 0, True
diff --git a/run.vbs b/run.vbs
@@ -1,2 +1,2 @@
 Set WshShell = CreateObject("WScript.Shell")
-WshShell.Run "launcher\launch.bat", 0, False
+WshShell.Run "launch.bat", 0, False
diff --git a/version.conf b/version.conf
@@ -0,0 +1 @@
+1.4.3