Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 147c1b60 by Tony CHEMIT at 2018-05-18T08:12:00Z Problème avec l'installeur - Closes #328 - - - - - 6 changed files: - t3-installer/src/main/assembly/dist/create-db.bat - t3-installer/src/main/assembly/dist/create-db.sh - t3-installer/src/main/assembly/dist/fill-db.bat - t3-installer/src/main/assembly/dist/fill-db.sh - t3-installer/src/main/config/T3Installer.ini - t3-installer/src/main/java/fr/ird/t3/console/T3Console.java Changes: ===================================== t3-installer/src/main/assembly/dist/create-db.bat ===================================== --- a/t3-installer/src/main/assembly/dist/create-db.bat +++ b/t3-installer/src/main/assembly/dist/create-db.bat @@ -1 +1 @@ -java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "db.properties" "%1" \ No newline at end of file +java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "%1" \ No newline at end of file ===================================== t3-installer/src/main/assembly/dist/create-db.sh ===================================== --- a/t3-installer/src/main/assembly/dist/create-db.sh +++ b/t3-installer/src/main/assembly/dist/create-db.sh @@ -1,3 +1,3 @@ #!/bin/sh -java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "db.properties" "$1" +java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "$1" ===================================== t3-installer/src/main/assembly/dist/fill-db.bat ===================================== --- a/t3-installer/src/main/assembly/dist/fill-db.bat +++ b/t3-installer/src/main/assembly/dist/fill-db.bat @@ -1 +1 @@ -java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "db.properties" "%1" \ No newline at end of file +java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "%1" \ No newline at end of file ===================================== t3-installer/src/main/assembly/dist/fill-db.sh ===================================== --- a/t3-installer/src/main/assembly/dist/fill-db.sh +++ b/t3-installer/src/main/assembly/dist/fill-db.sh @@ -1,3 +1,3 @@ #!/bin/sh -java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "db.properties" "$1" +java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "$1" ===================================== t3-installer/src/main/config/T3Installer.ini ===================================== --- a/t3-installer/src/main/config/T3Installer.ini +++ b/t3-installer/src/main/config/T3Installer.ini @@ -26,7 +26,7 @@ type = string description = Jdbc connection url key = url type = string -defaultValue = jdbc:postgresql:${dbName} +defaultValue = jdbc:postgresql:%s [action createDb] description = To create a new database (requires one argument: dbName) ===================================== t3-installer/src/main/java/fr/ird/t3/console/T3Console.java ===================================== --- a/t3-installer/src/main/java/fr/ird/t3/console/T3Console.java +++ b/t3-installer/src/main/java/fr/ird/t3/console/T3Console.java @@ -55,7 +55,7 @@ public class T3Console { throw new IllegalArgumentException(String.format("Need one arguments for command %s. Try with --help to get details.", action)); } - installerConfig = new T3InstallerConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.SYSTEM).setConfigFileName(args[1])); + installerConfig = new T3InstallerConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.SYSTEM)); installerConfig.get().parse(args); Console console = System.console(); View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/147c1b60cdac7c060f00b87088a39495f... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/147c1b60cdac7c060f00b87088a39495f... You're receiving this email because of your account on gitlab.com.