Revision 5162
Added by Aaron Marcuse-Kubitza over 12 years ago
| inputs/input.Makefile | ||
|---|---|---|
| 184 | 184 |
rm_schema: _always |
| 185 | 185 |
echo 'DROP SCHEMA IF EXISTS "$(datasrc)" CASCADE;'|$(psqlAsBien) |
| 186 | 186 |
|
| 187 |
logInstall = $(if $(log),$(if $(quiet),&>,2>&1|tee $(2)\ |
|
| 188 |
)$(1)logs/install.log.sql) |
|
| 189 |
logInstall* = $(call logInstall,$*/) |
|
| 190 |
logInstall*Add = $(call logInstall,$*/,-a)# append to log |
|
| 187 |
installLog := logs/install.log.sql |
|
| 191 | 188 |
|
| 189 |
logInstall = $(if $(log),$(if $(quiet),$(2)$(1)$(installLog) 2>&1,2>&1|tee $(3)\ |
|
| 190 |
$(1)$(installLog))) |
|
| 191 |
logInstall* = $(call logInstall,$*/,>) |
|
| 192 |
logInstall*Add = $(call logInstall,$*/,>>,-a)# append to log |
|
| 193 |
|
|
| 192 | 194 |
# Must come before %/install to override it |
| 193 | 195 |
sql/install: $(dbExports) |
| 194 | 196 |
($(inDatasrc); cat $+|grep -vF 'SET search_path')|"time" $(psqlAsBien) \ |
Also available in: Unified diff
input.Makefile: Staging tables installation: $(logInstall*Add): Fixed bug where the existing install log would be overwritten in quiet mode, even though this function should append its output to the log. Note that plain $(logInstall*) always overwrites the existing install log because it is used by the first install command.