From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 19 Oct 2010 15:57:55 +0000 (+0000)
Subject: In pg_upgrade, rename SHELL_EXT to SCRIPT_EXT, for clarity.
X-Git-Tag: REL9_1_ALPHA2~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=722d5beeb266ae83f548fc3953df700a71f30134;p=postgresql

In pg_upgrade, rename SHELL_EXT to SCRIPT_EXT, for clarity.
---

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 94c89cba0f..aac74603d8 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -389,7 +389,7 @@ create_script_for_old_cluster_deletion(migratorContext *ctx,
 	prep_status(ctx, "Creating script to delete old cluster");
 
 	snprintf(*deletion_script_file_name, MAXPGPATH, "%s/delete_old_cluster.%s",
-			 ctx->cwd, SHELL_EXT);
+			 ctx->cwd, SCRIPT_EXT);
 
 	if ((script = fopen(*deletion_script_file_name, "w")) == NULL)
 		pg_log(ctx, PG_FATAL, "Could not create necessary file:  %s\n",
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 5cc7d1f536..bbd4bad670 100644
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -40,7 +40,7 @@
 #define pg_link_file		link
 #define RM_CMD				"rm -f"
 #define RMDIR_CMD			"rm -rf"
-#define SHELL_EXT			"sh"
+#define SCRIPT_EXT			"sh"
 #else
 #define pg_copy_file		CopyFile
 #define pg_mv_file			pgrename
@@ -48,7 +48,7 @@
 #define sleep(x)			Sleep(x * 1000)
 #define RM_CMD				"DEL /q"
 #define RMDIR_CMD			"RMDIR /s/q"
-#define SHELL_EXT			"bat"
+#define SCRIPT_EXT			"bat"
 #define EXE_EXT				".exe"
 #endif