Project

General

Profile

« Previous | Next » 

Revision 9838

lib/runscripts/table.run: added set_make_vars to all make targets so $remake would be propagated appropriately

View differences:

lib/runscripts/table.run
26 26

  
27 27
map_table()
28 28
{
29
	echo_func
29
	echo_func; set_make_vars
30 30
	table_make map.csv
31 31
	psql <<EOF
32 32
SELECT util.reset_map_table('pg_temp.map');
......
35 35
EOF
36 36
}
37 37

  
38
mk_derived() { echo_func; "$root_dir"/schemas/VegCore/mk_derived; }
38
mk_derived()
39
{ echo_func; set_make_vars; "$root_dir"/schemas/VegCore/mk_derived; }
39 40

  
40 41
remake_VegBIEN_mappings()
41 42
{
42
	echo_func
43
	echo_func; set_make_vars
43 44
	public_schema_exists || return 0
44 45
	rm header.csv map.csv # remake them
45 46
	yes|table_make test
......
47 48

  
48 49
postprocess() # overridable
49 50
{
50
	echo_func
51
	echo_func; set_make_vars
51 52
	local file="$top_dir"/postprocess.sql
52 53
	if test -e "$file"; then psql "$@"; fi
53 54
}
......
56 57

  
57 58
load_data()
58 59
{
59
	echo_func
60
	echo_func; set_make_vars
60 61
	local verbosity_min=3 # install logs require verbose output
61 62
	set -- table_make ${remake:+re}install # just the table
62 63
	if remaking || test ! -e "$install_log"; then "$@" # OK to clobber log
......
66 67

  
67 68
import()
68 69
{
69
	echo_func
70
	echo_func; set_make_vars
70 71
	load_data
71 72
	map_table
72 73
	postprocess

Also available in: Unified diff