[ICIJ/datashare#360] remove powershell launcher and use batch instead

to avoid additionnal actions from user to run as admin
ICIJ · Apr 6, 2020 · 87b3b04 · 87b3b04
1 parent 636ea5d
commit 87b3b04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/windows/datashareStandalone.bat b/windows/datashareStandalone.bat
@@ -1,3 +1,5 @@
 @echo off
 
-powershell -noexit "& "".\\datashareStandalone.ps1 ${VERSION}"""
+cd %APPDATA%\Datashare # needed for /dist
+
+java -cp "dist;\Program Files\Datashare-${VERSION}\Datashare-${VERSION}-all.jar" -DPROD_MODE=true org.icij.datashare.Main -d %APPDATA\Datashare\data --queueType memory --busType memory --dataSourceUrl jdbc:sqlite:file:%APPDATA%\Datashare\dist\datashare.db --configFile %APPDATA%\Datashare\dist\datashare.conf --mode EMBEDDED --elasticsearchDataPath %APPDATA%\Datashare\index
diff --git a/windows/datashareStandalone.ps1 b/windows/datashareStandalone.ps1
diff --git a/windows/installDatashareStandalone.nsi b/windows/installDatashareStandalone.nsi
@@ -53,7 +53,6 @@ Function InstallDatashare
   exch $R0
   SetOutPath "$INSTDIR"
   File "datashare.ico"
-  File "datashareStandalone.ps1"
   File /oname=datashareStandalone.bat "dist/datashareStandalone.bat"
 
   # Start Menu