mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2024-11-21 16:27:39 -06:00
Revert "Detect if running in Flatpak; patch pythonPath and pgadminFile accordingly."
This reverts commit d98ee76b8d
.
This commit is contained in:
parent
ff287f32c5
commit
dfaea944f0
@ -26,10 +26,6 @@ const createDir = (dirName) => {
|
||||
}
|
||||
};
|
||||
|
||||
export const insideFlatpak = () => {
|
||||
return platform() === 'linux' && fs.existsSync('/.flatpak-info');
|
||||
}
|
||||
|
||||
// This function is used to get the python executable path
|
||||
// based on the platform. Use this for deployment.
|
||||
const getPythonPath = () => {
|
||||
@ -41,11 +37,8 @@ const getPythonPath = () => {
|
||||
case 'darwin':
|
||||
pythonPath = '../../Frameworks/Python.framework/Versions/Current/bin/python3';
|
||||
break;
|
||||
case 'linux':
|
||||
pythonPath = '../venv/bin/python3';
|
||||
if (insideFlatpak()) {
|
||||
pythonPath = '/usr/bin/python';
|
||||
}
|
||||
case 'linux':
|
||||
pythonPath = '../venv/bin/python3';
|
||||
break;
|
||||
default:
|
||||
if (platform().startsWith('win')) {
|
||||
|
@ -29,10 +29,6 @@ let pythonPath = misc.getPythonPath();
|
||||
let pgadminFile = '../web/pgAdmin4.py';
|
||||
let configFile = '../web/config.py';
|
||||
|
||||
if (insideFlatpak()) {
|
||||
pgadminFile = '/app/pgAdmin4/web/pgAdmin4.py';
|
||||
}
|
||||
|
||||
// Override the paths above, if a developer needs to
|
||||
if (fs.existsSync('dev_config.json')) {
|
||||
try {
|
||||
|
Loading…
Reference in New Issue
Block a user