|
38 | 38 | sys.path.append(__STATIC_SETUP_DIR__)
|
39 | 39 |
|
40 | 40 | logs_dir = os.path.join(__STATIC_SETUP_DIR__, 'logs')
|
41 |
| -argsp = None |
42 | 41 |
|
43 | 42 | if not os.path.exists(logs_dir):
|
44 | 43 | os.makedirs(logs_dir)
|
|
60 | 59 | parser.add_argument('--jans-branch', help="Jannsen github branch", default='main')
|
61 | 60 | parser.add_argument('-shell', help="Jannsen github branch", action='store_true')
|
62 | 61 |
|
| 62 | +from setup_app.utils import arg_parser |
| 63 | + |
| 64 | +arg_parser.add_to_me(parser) |
| 65 | + |
| 66 | +installed = False |
| 67 | + |
63 | 68 |
|
64 | 69 | if not os.path.exists('/etc/jans/conf/jans.properties'):
|
65 |
| - parser.add_to_setup_parser = True |
66 |
| - from setup_app.utils import arg_parser |
| 70 | + installed = True |
67 | 71 | try:
|
68 | 72 | from jans_setup import jans_setup
|
69 | 73 | except ImportError:
|
70 | 74 | import jans_setup
|
71 | 75 | jans_setup.main()
|
72 |
| - argsp = arg_parser.get_parser() |
73 |
| - |
74 | 76 |
|
| 77 | +argsp = arg_parser.get_parser() |
75 | 78 |
|
76 | 79 | from setup_app import static
|
77 | 80 | from setup_app.utils import base
|
|
90 | 93 | if not os.path.join(Config.outputFolder):
|
91 | 94 | os.makedirs(Config.outputFolder)
|
92 | 95 |
|
93 |
| -if not argsp: |
94 |
| - argsp = parser.parse_known_args()[0] |
| 96 | +if not installed: |
95 | 97 |
|
96 | 98 | # initialize config object
|
97 | 99 | Config.init(paths.INSTALL_DIR)
|
|
100 | 102 | collectProperties = CollectProperties()
|
101 | 103 | collectProperties.collect()
|
102 | 104 |
|
103 |
| -if os.environ.get('jans_setup_branch') and not argsp.jans_setup_branch: |
104 |
| - argsp.jans_setup_branch = os.environ['jans_setup_branch'] |
105 |
| - |
106 | 105 | maven_base_url = 'https://jenkins.jans.io/maven/io/jans/'
|
107 | 106 | app_versions = {
|
108 | 107 | "SETUP_BRANCH": argsp.jans_setup_branch,
|
|
0 commit comments