Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/scripts/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def setup_pgedge(User=None, Passwd=None, dbName=None, port=None, pg_data=None, p
util.exit_message(
"pg_data cannot be set as relative path. Please specify absolute path instead"
)
pg_init_options = f"--datadir={pg_data}"
pg_init_options = f'--datadir="{pg_data}"'

setup_core.check_pre_reqs(
User, Passwd, dbName, port, pg_data, pg_major, pg_minor, spock_ver, autostart)
Expand Down
13 changes: 9 additions & 4 deletions src/pgXX/init-pgXX.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import util, startup
import argparse, os, sys, shutil, subprocess, getpass, json
import shlex

MY_HOME = os.getenv("MY_HOME", "")

Expand Down Expand Up @@ -196,10 +197,14 @@ def fatal_error(p_msg):
util.update_postgresql_conf(pgver, i_port)

if util.get_platform() == "Linux":
os.system("cp " + pgver + "/genSelfCert.sh " + pg_data + "/.")
os.system(pg_data + "/genSelfCert.sh")

os.system("cp " + pgver + "/pg_hba.conf.nix " + pg_data + "/pg_hba.conf")
gen_cert_src = os.path.join(pgver, "genSelfCert.sh")
gen_cert_dst = os.path.join(pg_data, "genSelfCert.sh")
os.system(f'cp {shlex.quote(gen_cert_src)} {shlex.quote(gen_cert_dst)}')
os.system(f'{shlex.quote(gen_cert_dst)}')

pg_hba_src = os.path.join(pgver, "pg_hba.conf.nix")
pg_hba_dst = os.path.join(pg_data, "pg_hba.conf")
os.system(f'cp {shlex.quote(pg_hba_src)} {shlex.quote(pg_hba_dst)}')

if is_password:
pg_pass_file = util.remember_pgpassword(pg_password, "*", "*", "*", os_user)
Expand Down