Run scripts from project dir

osm-fr · Feb 22, 2023 · 59470c7 · 59470c7
1 parent ad7ce15
commit 59470c7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -44,8 +44,6 @@ sudo -u postgres -s "./create_base.sh"
 
 ## Chargement des données OSM
 
-Se placer dans le répertoire `DATA_DIR`, et appeler les scripts depuis là.
-
 Charger des données OSM depuis un pbf, France entière ou un extract plus petit.
 ```
 load_osm_france_db.sh

diff --git a/copy_table_from_osm_to_cadastre.sh b/copy_table_from_osm_to_cadastre.sh
@@ -2,8 +2,7 @@
 
 set -e
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $SCRIPT_DIR/config
+source config
 
 set -e
 

diff --git a/load_osm_france_db.sh b/load_osm_france_db.sh
@@ -2,8 +2,7 @@
 
 set -e
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $SCRIPT_DIR/config
+source config
 
 PBF_URL=${1:-http://download.openstreetmap.fr/extracts/merge/france_metro_dom_com_nc.osm.pbf}
 PBF_FILE=$(basename "$PBF_URL")

diff --git a/update_table_infos_communes.sh b/update_table_infos_communes.sh
@@ -2,7 +2,6 @@
 
 set -e
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $SCRIPT_DIR
+source config
 
 $pgsql_OSM -f ./sql/update_table_infos_communes.sql
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,7 @@ @@
     set -e
-    SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-    source $SCRIPT_DIR/config
+    source config
     set -e
@@ Expand Down @@