Skip to content

Commit

Permalink
[ICIJ/datashare#360] adds version parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
bamthomas committed Mar 10, 2020
1 parent 07cc01f commit ace44dc
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions windows/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ $(DIST)/installDatashare.exe: $(DIST)
makensis installDatashare.nsi

$(DIST)/installDatashareLight.exe: $(DIST)
../mac/build/gen_file datashareLight.bat $(DIST)/datashareLight.bat
makensis installDatashareLight.nsi

PHONY: clean
Expand Down
2 changes: 1 addition & 1 deletion windows/datashareLight.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@echo off

powershell -noexit "& "".\datashareLight.ps1"""
powershell -noexit "& "".\\datashareLight.ps1 ${VERSION}"""
8 changes: 7 additions & 1 deletion windows/datashareLight.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
$VERSION=$args[0]

cd $Env:APPDATA\Datashare # needed for /app and /dist

java -cp "dist;\Program Files\Datashare-5.8.21\Datashare-5.8.21.jar" -DPROD_MODE=true org.icij.datashare.Main -d $Env:APPDATA\Datashare\data\ --queueType memory --busType memory --dataSourceUrl jdbc:sqlite:file:$Env:APPDATA\Datashare\dist\datashare.db --configFile $Env:APPDATA\Datashare\dist\datashare.conf --mode EMBEDDED --elasticsearchDataPath $Env:APPDATA\Datashare\es\
java -cp "dist;\Program Files\Datashare-$VERSION\Datashare-$VERSION.jar" -DPROD_MODE=true org.icij.datashare.Main `
-d $Env:APPDATA\Datashare\data\ --queueType memory --busType memory `
--dataSourceUrl jdbc:sqlite:file:$Env:APPDATA\Datashare\dist\datashare.db `
--configFile $Env:APPDATA\Datashare\dist\datashare.conf --mode EMBEDDED `
--elasticsearchDataPath $Env:APPDATA\Datashare\es\
2 changes: 1 addition & 1 deletion windows/installDatashareLight.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ Function InstallDatashare
exch $R0
SetOutPath "$INSTDIR"
File "datashare.ico"
File "datashareLight.bat"
File "datashareLight.ps1"
File /oname=datashareLight.bat "dist/datashareLight.bat"

# Start Menu
createDirectory "$SMPROGRAMS\${COMPANYNAME}"
Expand Down

0 comments on commit ace44dc

Please sign in to comment.