Merge pull request #17 from EyeSeeTea/development

Development
EyeSeeTea · Oct 29, 2019 · 4fffc79 · 4fffc79
2 parents 209c7d0 + 545fbb0
commit 4fffc79
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.sh text eol=lf
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="d2_docker",
-    version="1.0.1",
+    version="1.0.2",
     description="Dockers for DHIS2 instances",
     long_description=open("README.md", encoding="utf-8").read(),
     keywords=["python"],

diff --git a/src/d2_docker/config/dhis2-core-start.sh b/src/d2_docker/config/dhis2-core-start.sh
@@ -34,11 +34,7 @@ run_sql_files() {
 
     find "$base_db_path" -type f | sort | while read path; do
         echo "Load SQL: $path"
-        case "$path" in
-            *.gz) zcat "$path" | $psql_cmd || true;;
-            *.dump) cat "$path" | $pgrestore_cmd || true;;
-            *) cat "$path" | $psql_cmd || true;;
-        esac
+	$pgrestore_cmd "$path" || zcat "$path" | $psql_cmd || cat "$path" | $psql_cmd || true
     done
 }