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 94c89cba0f808c3aa4360052b1ecf20c8eddec02..aac74603d81901632b32141bc79cc2dccf9dcca3 100644 (file)
--- 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 5cc7d1f536c5c09f8edd5b16662cf176303739c7..bbd4bad670cbe3594a36cdb1d9c0204f06d7b9b1 100644 (file)
--- 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