rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Bruce Momjian 2014-10-11 18:38:41 -04:00
parent 80e6af1272
commit dc9c612767
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pg_upgrade/check.c
View File

@ -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

2
contrib/pg_upgrade/pg_upgrade.h
View File

@ -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 ""