Add removal of PG_VERSION to optional old cluster deletion script.

Backpatch to 9.0.X.

Author: bmomjian

contrib/pg_upgrade/check.c

@@ -416,6 +416,11 @@ create_script_for_old_cluster_deletion(migratorContext *ctx,
 			int			dbnum;
 
 			fprintf(script, "\n");
+			/* remove PG_VERSION? */
+			if (GET_MAJOR_VERSION(ctx->old.major_version) <= 804)
+				fprintf(script, RM_CMD " %s%s/PG_VERSION\n",
+						ctx->tablespaces[tblnum], ctx->old.tablespace_suffix);
+
 			for (dbnum = 0; dbnum < ctx->new.dbarr.ndbs; dbnum++)
 			{
 				fprintf(script, RMDIR_CMD " %s%s/%d\n",

contrib/pg_upgrade/pg_upgrade.h

@@ -38,13 +38,15 @@
 #define pg_copy_file		copy_file
 #define pg_mv_file			rename
 #define pg_link_file		link
+#define RM_CMD				"rm -f"
 #define RMDIR_CMD			"rm -rf"
 #define SHELL_EXT			"sh"
 #else
 #define pg_copy_file		CopyFile
 #define pg_mv_file			pgrename
 #define pg_link_file		win32_pghardlink
 #define sleep(x)			Sleep(x * 1000)
+#define RM_CMD				"DEL /q"
 #define RMDIR_CMD			"RMDIR /s/q"
 #define SHELL_EXT			"bat"
 #define EXE_EXT				".exe"