diff options
| author | Bruce Momjian <bruce@momjian.us> | 2014-10-11 18:38:41 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2014-10-11 18:38:41 -0400 |
| commit | dc9c612767f20f28f35f06d709d59ed8477bfe32 (patch) | |
| tree | 2aa4c5d8d0bcc0ad3021ec2810b557483cac6411 | |
| parent | 80e6af1272750595c02e910bde907e30c592579b (diff) | |
| download | postgresql-dc9c612767f20f28f35f06d709d59ed8477bfe32.tar.gz postgresql-dc9c612767f20f28f35f06d709d59ed8477bfe32.zip | |
pg_upgrade: prefix Unix shell script name output with "./"
This more clearly suggests the current directory. While this also works
on Windows, it might be confusing.
Report by Christoph Berg
| -rw-r--r-- | contrib/pg_upgrade/check.c | 6 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 1b838777a72..56db0dd6540 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -408,7 +408,8 @@ create_script_for_cluster_analyze(char **analyze_script_file_name) if (os_info.user_specified) user_specification = psprintf("-U \"%s\" ", os_info.user); - *analyze_script_file_name = psprintf("analyze_new_cluster.%s", SCRIPT_EXT); + *analyze_script_file_name = psprintf("%sanalyze_new_cluster.%s", + SCRIPT_PREFIX, SCRIPT_EXT); if ((script = fopen_priv(*analyze_script_file_name, "w")) == NULL) pg_fatal("Could not open file \"%s\": %s\n", @@ -489,7 +490,8 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name) int tblnum; char old_cluster_pgdata[MAXPGPATH]; - *deletion_script_file_name = psprintf("delete_old_cluster.%s", SCRIPT_EXT); + *deletion_script_file_name = psprintf("%sdelete_old_cluster.%s", + SCRIPT_PREFIX, SCRIPT_EXT); /* * Some users (oddly) create tablespaces inside the cluster data diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index 65dda9780ab..c3b81e4a083 100644 --- a/contrib/pg_upgrade/pg_upgrade.h +++ b/contrib/pg_upgrade/pg_upgrade.h @@ -76,6 +76,7 @@ extern char *output_files[]; #define PATH_SEPARATOR '/' #define RM_CMD "rm -f" #define RMDIR_CMD "rm -rf" +#define SCRIPT_PREFIX "./" #define SCRIPT_EXT "sh" #define ECHO_QUOTE "'" #define ECHO_BLANK "" @@ -86,6 +87,7 @@ extern char *output_files[]; #define PATH_SEPARATOR '\\' #define RM_CMD "DEL /q" #define RMDIR_CMD "RMDIR /s/q" +#define SCRIPT_PREFIX "" #define SCRIPT_EXT "bat" #define EXE_EXT ".exe" #define ECHO_QUOTE "" |