Options cleanup

alubennikova · alubennikova · commit 1af622f78a4e · 2017-04-20T15:22:18.000+03:00
diff --git a/backup.c b/backup.c
@@ -454,6 +454,13 @@ do_backup(void)
 
 	pgBackupValidate(&current);
 
+	/*
+	 * After successfil backup completion remove backups
+	 * which are expired according to retention policies
+	 */
+	if (delete_expired)
+		do_retention_purge();
+
 	return 0;
 }
 
diff --git a/pg_probackup.c b/pg_probackup.c
@@ -130,14 +130,18 @@ main(int argc, char *argv[])
 			backup_subcmd = SHOW;
 		else if (strcmp(argv[1], "delete") == 0)
 			backup_subcmd = DELETE;
-		else if (strcmp(argv[1], "configure") == 0)
+		else if (strcmp(argv[1], "config") == 0)
 			backup_subcmd = CONFIGURE;
-		else if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
+		else if (strcmp(argv[1], "--help") == 0
+				|| strcmp(argv[1], "help") == 0
+				|| strcmp(argv[1], "-?") == 0)
 		{
 			help(true);
 			exit(0);
 		}
-		else if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
+		else if (strcmp(argv[1], "--version") == 0
+				 || strcmp(argv[1], "version") == 0
+				 || strcmp(argv[1], "-V") == 0)
 		{
 			fprintf(stderr, "%s %s\n", PROGRAM_NAME, PROGRAM_VERSION);
 			exit(0);
