]> granicus.if.org Git - postgis/commitdiff
Avoid a few bashisms resulting in invalid SQL files
authorSandro Santilli <strk@kbt.io>
Fri, 24 Mar 2017 20:51:33 +0000 (20:51 +0000)
committerSandro Santilli <strk@kbt.io>
Fri, 24 Mar 2017 20:51:33 +0000 (20:51 +0000)
An echo that's supposed to output a backslash works with bash, but not
in dash. Use printf, instead.

Patch by: Markus Wanner <markus@bluegap.ch>

git-svn-id: http://svn.osgeo.org/postgis/trunk@15342 b70326c6-7e19-0410-871a-916f4a2858ee

extensions/postgis/Makefile.in
extensions/postgis_sfcgal/Makefile.in

index 90d5fb37665c43f9fb6527284ebd5caa160bfcd4..1193c09594ee94ce6bd168d9d973d250c404f6a5 100644 (file)
@@ -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
index 707a349159945744cb91bade063e7829c844fd8c..fbbe864fb9c075720bf4da002fc2c9150b973af3 100644 (file)
@@ -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