tjh.dev
1From 391433d020da52fba28ad08beb2cc85ffd852044 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
3Date: Wed, 23 Feb 2022 14:40:11 +0100
4Subject: [PATCH] Expose setup.py as pgadmin4-setup
5
6---
7 pkg/pip/setup_pip.py | 5 ++++-
8 web/setup.py | 14 ++++++++------
9 2 files changed, 12 insertions(+), 7 deletions(-)
10
11diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py
12index 5592d1b04..131eaa1ed 100644
13--- a/pkg/pip/setup_pip.py
14+++ b/pkg/pip/setup_pip.py
15@@ -95,7 +95,10 @@ setup(
16 },
17
18 entry_points={
19- 'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main'],
20+ 'console_scripts': [
21+ 'pgadmin4=pgadmin4.pgAdmin4:main',
22+ 'pgadmin4-setup=pgadmin4.setup:main'
23+ ],
24 },
25
26 )
27diff --git a/web/setup.py b/web/setup.py
28index 5f4257e86..df970f049 100644
29--- a/web/setup.py
30+++ b/web/setup.py
31@@ -32,6 +32,10 @@ from pgadmin import create_app
32 from pgadmin.utils import clear_database_servers, dump_database_servers,\
33 load_database_servers
34
35+# Configuration settings
36+import config
37+from pgadmin.model import SCHEMA_VERSION
38+from pgadmin.setup import db_upgrade, create_app_data_directory
39
40 def dump_servers(args):
41 """Dump the server groups and servers.
42@@ -139,12 +143,7 @@ def clear_servers():
43 clear_database_servers(load_user, True)
44
45
46-if __name__ == '__main__':
47- # Configuration settings
48- import config
49- from pgadmin.model import SCHEMA_VERSION
50- from pgadmin.setup import db_upgrade, create_app_data_directory
51-
52+def main():
53 parser = argparse.ArgumentParser(description='Setup the pgAdmin config DB')
54
55 exp_group = parser.add_argument_group('Dump server config')
56@@ -194,3 +193,6 @@ if __name__ == '__main__':
57 print(str(e))
58 else:
59 setup_db()
60+
61+if __name__ == '__main__':
62+ main()
63--
642.35.1
65