diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfdb8b7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf diff --git a/setup.py b/setup.py index e8f18b2..8e3da49 100644 --- 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 index 0d599c8..7358af3 100755 --- 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 }