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

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 1b838777a725a3642ac2e686ee3856fb3ac8fbad..56db0dd654000ec61c5d0a65996cd0a3b9b63a06 100644 (file)
--- 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 65dda9780ab91f733ca44f12252166b40023860e..c3b81e4a08308b317aa14ac8e76c91cabecd2f3e 100644 (file)
--- 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     ""