bugfix: do not use find_my_exec(), because it is relying on PATH, which can be unavailable. More details: #39

Author: gsmolk

src/pg_probackup.c

@@ -20,9 +20,10 @@
 #include "utils/thread.h"
 #include <time.h>
 
-const char *PROGRAM_URL		= "https://github.com/postgrespro/pg_probackup";
-const char *PROGRAM_EMAIL	= "https://github.com/postgrespro/pg_probackup/issues";
-const char *PROGRAM_FULL_PATH = NULL;
+const char  *PROGRAM_NAME = NULL;
+const char  *PROGRAM_FULL_PATH = NULL;
+const char  *PROGRAM_URL = "https://github.com/postgrespro/pg_probackup";
+const char  *PROGRAM_EMAIL = "https://github.com/postgrespro/pg_probackup/issues";
 
 typedef enum ProbackupSubcmd
 {
@@ -245,13 +246,7 @@ main(int argc, char *argv[])
 	PROGRAM_NAME = get_progname(argv[0]);
 	PROGRAM_FULL_PATH = palloc0(MAXPGPATH);
 
-	if (find_my_exec(argv[0],(char *) PROGRAM_FULL_PATH) < 0)
-	{
-		fprintf(stderr, _("%s: could not find own program executable\n"), PROGRAM_NAME);
-		exit(1);
-	}
-
-	set_pglocale_pgservice(argv[0], "pgscripts");
+	//set_pglocale_pgservice(argv[0], "pgscripts");
 
 #if PG_VERSION_NUM >= 110000
 	/*
@@ -514,6 +509,15 @@ main(int argc, char *argv[])
 		command = NULL;
 	}
 
+	/* For archive-push and archive-get skip full path lookup */
+	if ((backup_subcmd != ARCHIVE_GET_CMD &&
+		backup_subcmd != ARCHIVE_PUSH_CMD) &&
+		(find_my_exec(argv[0],(char *) PROGRAM_FULL_PATH) < 0))
+	{
+			PROGRAM_FULL_PATH = NULL;
+			elog(WARNING, "%s: could not find a full path to executable", PROGRAM_NAME);
+	}
+
 	/*
 	 * We have read pgdata path from command line or from configuration file.
 	 * Ensure that pgdata is an absolute path.

src/pg_probackup.h

@@ -34,6 +34,12 @@
 
 #include "datapagemap.h"
 
+/* pgut client variables and full path */
+extern const char  *PROGRAM_NAME;
+extern const char  *PROGRAM_FULL_PATH;
+extern const char  *PROGRAM_URL;
+extern const char  *PROGRAM_EMAIL;
+
 /* Directory/File names */
 #define DATABASE_DIR				"database"
 #define BACKUPS_DIR				"backups"

src/restore.c

@@ -882,7 +882,8 @@ create_recovery_conf(time_t backup_id,
 
 		fio_fprintf(fp, "restore_command = '%s archive-get -B %s --instance %s "
 					"--wal-file-path %%p --wal-file-name %%f'\n",
-					PROGRAM_FULL_PATH, backup_path, instance_name);
+					PROGRAM_FULL_PATH ? PROGRAM_FULL_PATH : PROGRAM_NAME,
+					backup_path, instance_name);
 
 		/*
 		 * We've already checked that only one of the four following mutually

src/utils/pgut.c

@@ -8,6 +8,7 @@
  *-------------------------------------------------------------------------
  */
 
+#include "pg_probackup.h"
 #include "postgres_fe.h"
 
 #include "getopt_long.h"
@@ -22,8 +23,6 @@
 #include "file.h"
 
 
-const char *PROGRAM_NAME = "pg_probackup";
-
 static char	   *password = NULL;
 bool			prompt_password = true;
 bool			force_password = false;

src/utils/pgut.h

@@ -16,15 +16,6 @@
 
 typedef void (*pgut_atexit_callback)(bool fatal, void *userdata);
 
-/*
- * pgut client variables and functions
- */
-extern const char  *PROGRAM_NAME;
-extern const char  *PROGRAM_FULL_PATH;
-extern const char  *PROGRAM_VERSION;
-extern const char  *PROGRAM_URL;
-extern const char  *PROGRAM_EMAIL;
-
 extern void	pgut_help(bool details);
 
 /*