Merge remote-tracking branch 'origin/master'

2019-02-14 12:30:22 -07:00
parent 2200a6a2d3 b142de57d5
commit 015c80215c
2 changed files with 14 additions and 2 deletions
@@ -1,3 +1,5 @@
+import org.gradle.internal.os.OperatingSystem;
+
 plugins {
    id 'java'
 }
@@ -35,6 +37,11 @@ dependencies {
 }

 task loadDb(type: Exec, group: 'Verification', description: 'Reloads the local database.') {
-    workingDir "./scripts/mysql"
-    commandLine './loaddb.sh'
+    if (OperatingSystem.current().isLinux() || OperatingSystem.current().isMacOsX()) {
+        workingDir "./scripts/mysql"
+        commandLine './loaddb.sh'
+    } else {
+        workingDir "./scripts/mysql"
+        commandLine 'loaddb.bat'
+    }
 }