aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2010-10-19 15:57:55 +0000
committerBruce Momjian <bruce@momjian.us>2010-10-19 15:57:55 +0000
commit722d5beeb266ae83f548fc3953df700a71f30134 (patch)
treee8a70aa15247c5f48ac77eee9202de68f34b9b3e
parent51eeccd6cc2e0fcb95112e0e4a7a20d0f95c181a (diff)
downloadpostgresql-722d5beeb266ae83f548fc3953df700a71f30134.tar.gz
postgresql-722d5beeb266ae83f548fc3953df700a71f30134.zip
In pg_upgrade, rename SHELL_EXT to SCRIPT_EXT, for clarity.
-rw-r--r--contrib/pg_upgrade/check.c2
-rw-r--r--contrib/pg_upgrade/pg_upgrade.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 94c89cba0f8..aac74603d81 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 5cc7d1f536c..bbd4bad670c 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