Merge pull request #211 from FAIRDataPipeline/hotfix/windows-space

Hotfix/windows space

Author: RyanJField

CITATION.cff

@@ -30,6 +30,6 @@ license: "BSD-2-Clause"
 message: "If you use this software, please cite it using these metadata."
 repository-code: "https://github.com/FAIRDataPipeline/data-registry/"
 title: "The FAIR Data Registry"
-version: "v1.0.8"
+version: "v1.0.9"
 doi: "10.5281/zenodo.5562750"
 date-released: "2023-02-03"

pyproject.toml

@@ -15,7 +15,7 @@ authors = [
   ]
 description = "Codebase for the FAIR data-registry"
 name = "data-registry"
-version = "v1.0.8"
+version = "v1.0.9"
 
 [tool.poetry.dependencies]
 Django = "3.1.13"

scripts/start_fair_registry_windows.bat

@@ -24,7 +24,7 @@ pushd %FAIR_HOME%
 	set FAIR_HOME=%CD%\
 popd
 
-if not exist %FAIR_HOME:"=%venv\Scripts\ (
+if not exist "%FAIR_HOME%venv\Scripts\" (
 	echo VENV Direcory does not exist, did you install using local_registry.bat?
 	exit /b 1
 )
@@ -104,7 +104,7 @@ if not "%1" == "" (
 
 set FULL_ADDRESS=%ADDRESS%:%PORT%
 
-cd /d %FAIR_HOME%
+cd /d "%FAIR_HOME%"
 
 :: Set Environment Variables needed for Django
 set DJANGO_SETTINGS_MODULE=%DRAMS%
@@ -114,14 +114,14 @@ set DJANGO_SETTINGS_MODULE=%DRAMS%
 @echo Spawning Server at %FULL_ADDRESS%
 
 if %BACKGROUND%==0 (
-	start %FAIR_HOME:"=%\venv\Scripts\python %FAIR_HOME:"=%manage.py runserver %FULL_ADDRESS% 1> %FAIR_HOME:"=%\output.log 2>&1
+	start "Fair Registry" "%FAIR_HOME%\venv\Scripts\python" "%FAIR_HOME%manage.py" runserver %FULL_ADDRESS% 1> "%FAIR_HOME%\output.log" 2>&1
 ) else (
-	start /b %FAIR_HOME:"=%\venv\Scripts\python %FAIR_HOME:"=%manage.py runserver %FULL_ADDRESS% 1> %FAIR_HOME:"=%\output.log 2>&1
+	start /b "Fair Registry" "%FAIR_HOME%\venv\Scripts\python" "%FAIR_HOME%manage.py" runserver %FULL_ADDRESS% 1> "%FAIR_HOME%\output.log" 2>&1
 )
 
 echo Writing Session and Port Info
-echo %PORT% > %FAIR_HOME:"=%session_port.log
-echo %ADDRESS% > %FAIR_HOME:"=%session_address.log
+echo %PORT% > "%FAIR_HOME%session_port.log"
+echo %ADDRESS% > "%FAIR_HOME%session_address.log"
 
 if %ADDRESS%==0.0.0.0 (
 	echo Bound to All Addresses ^(0.0.0.0^) setting to loopback address 127.0.0.1
@@ -142,8 +142,8 @@ set /A count=0
 
 echo Server Started Successfully
 
-call %FAIR_HOME:"=%\venv\Scripts\python %FAIR_HOME:"=%manage.py get_token > %FAIR_HOME:"=%\token 2>&1
-echo Token available at %FAIR_HOME:"=%\token
+call "%FAIR_HOME%\venv\Scripts\python" "%FAIR_HOME%manage.py" get_token > "%FAIR_HOME%token" 2>&1
+echo Token available at "%FAIR_HOME%token"
 
 cd /d %prevwd%
 

scripts/stop_fair_registry_windows.bat

@@ -2,9 +2,9 @@
 
 echo Getting Process ID
 
-FOR /F %%T IN ('Wmic process where^(CommandLine like "%%manage.py runserver%%"^)get ProcessId^|more +1') DO (
+FOR /F %%T IN ('wmic process where "commandline like '%%manage.py%%runserver%%'" get processid^|more +1') DO (
 SET /A ProcessId=%%T) &GOTO SkipLine                                                   
 :SkipLine                                                                              
 echo Stopping ProcessId = %ProcessId%   
 
-taskkill /F /PID %ProcessId% /t
+taskkill /F /PID %ProcessId% /t 2> nul