diff --git a/plugins/postgresql/index.py b/plugins/postgresql/index.py index f7bc367e7..ac04c53b9 100755 --- a/plugins/postgresql/index.py +++ b/plugins/postgresql/index.py @@ -244,6 +244,10 @@ def status(version=''): return 'start' +def pgCmd(cmd): + return = "su - postgres -c \"" + cmd + "\"" + + def pGetDbUser(): if mw.isAppleSystem(): user = mw.execShell( @@ -257,7 +261,7 @@ def initPgData(): if not os.path.exists(serverdir + '/data'): cmd = serverdir + '/bin/initdb -D ' + serverdir + "/data" if not mw.isAppleSystem(): - cmd = "su - postgres -c \"" + cmd + "\"" + cmd = pgCmd(cmd) # print(cmd) mw.execShell(cmd) return False @@ -277,8 +281,8 @@ def initPgPwd(): cmd_pass = "echo \"alter user postgres with password '" + pwd + "'\" | " if not mw.isAppleSystem(): - cmd_pass = cmd_pass + ' su - postgres -c "' + \ - serverdir + '/bin/psql -d postgres"' + cmd = serverdir + '/bin/psql -d postgres' + cmd_pass = cmd_pass + ' ' pgCmd(cmd) else: cmd_pass = cmd_pass + serverdir + '/bin/psql -d postgres' diff --git a/plugins/postgresql/versions/14.4/install.sh b/plugins/postgresql/versions/14.4/install.sh index 85bdbb6ac..e3253f578 100755 --- a/plugins/postgresql/versions/14.4/install.sh +++ b/plugins/postgresql/versions/14.4/install.sh @@ -15,6 +15,8 @@ postgreDir=${serverPath}/source/postgresql VERSION=14.4 +# su - postgres -c + Install_App() { mkdir -p ${postgreDir}