Skip to content

Commit d235ef4

Browse files
committed
feat: flex-linux-setup argparse pkg issue
1 parent d05061f commit d235ef4

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

flex-linux-setup/flex_linux_setup/flex_setup.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
sys.path.append(__STATIC_SETUP_DIR__)
3939

4040
logs_dir = os.path.join(__STATIC_SETUP_DIR__, 'logs')
41-
argsp = None
4241

4342
if not os.path.exists(logs_dir):
4443
os.makedirs(logs_dir)
@@ -60,18 +59,22 @@
6059
parser.add_argument('--jans-branch', help="Jannsen github branch", default='main')
6160
parser.add_argument('-shell', help="Jannsen github branch", action='store_true')
6261

62+
from setup_app.utils import arg_parser
63+
64+
arg_parser.add_to_me(parser)
65+
66+
installed = False
67+
6368

6469
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
6771
try:
6872
from jans_setup import jans_setup
6973
except ImportError:
7074
import jans_setup
7175
jans_setup.main()
72-
argsp = arg_parser.get_parser()
73-
7476

77+
argsp = arg_parser.get_parser()
7578

7679
from setup_app import static
7780
from setup_app.utils import base
@@ -90,8 +93,7 @@
9093
if not os.path.join(Config.outputFolder):
9194
os.makedirs(Config.outputFolder)
9295

93-
if not argsp:
94-
argsp = parser.parse_known_args()[0]
96+
if not installed:
9597

9698
# initialize config object
9799
Config.init(paths.INSTALL_DIR)
@@ -100,9 +102,6 @@
100102
collectProperties = CollectProperties()
101103
collectProperties.collect()
102104

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-
106105
maven_base_url = 'https://jenkins.jans.io/maven/io/jans/'
107106
app_versions = {
108107
"SETUP_BRANCH": argsp.jans_setup_branch,

0 commit comments

Comments
 (0)