From: Sandro Santilli Date: Fri, 24 Mar 2017 20:51:33 +0000 (+0000) Subject: Avoid a few bashisms resulting in invalid SQL files X-Git-Tag: 2.4.0alpha~142 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=363a1d2ed3348f18901508d8948c74b9b65ac7cd;p=postgis Avoid a few bashisms resulting in invalid SQL files An echo that's supposed to output a backslash works with bash, but not in dash. Use printf, instead. Patch by: Markus Wanner git-svn-id: http://svn.osgeo.org/postgis/trunk@15342 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index 90d5fb376..1193c0959 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -39,7 +39,7 @@ all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERS sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/spatial_ref_sys_config_dump.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql mkdir -p sql - echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@ + printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@ cat $^ >> $@ sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql @@ -94,7 +94,7 @@ sql_bits/raster_comments.sql: ../../doc/raster_comments.sql #postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql - echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@ + printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@ cat $^ >> $@ sql_minor_upgrade: sql_bits/postgis_extension_upgrade_minor.sql diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in index 707a34915..fbbe864fb 100644 --- a/extensions/postgis_sfcgal/Makefile.in +++ b/extensions/postgis_sfcgal/Makefile.in @@ -74,7 +74,7 @@ sql_bits/sfcgal_upgrade.sql : ../../postgis/sfcgal_upgrade.sql sql_bits/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/sfcgal_upgrade.sql ../../doc/sfcgal_comments.sql ../postgis_extension_helper_uninstall.sql mkdir -p sql_bits - echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@ + printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@ cat $^ >> $@ sql_minor_upgrade: sql_bits/sfcgal_upgrade_minor.sql