Skip to content

Commit 0724544

Browse files
committed
General improvements
1 parent 42f539a commit 0724544

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

core/_version.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ def _get_git_version() -> Optional[str]:
8282
import subprocess
8383
result = subprocess.run(
8484
['git', 'describe', '--tags', '--dirty', '--always'],
85-
capture_output=True,
86-
text=True,
85+
stdout=subprocess.PIPE,
86+
stderr=subprocess.PIPE,
87+
universal_newlines=True,
8788
cwd=os.path.dirname(os.path.dirname(__file__))
8889
)
8990
if result.returncode == 0:

core/vmnf_arg_parser.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ def parse_args(self):
177177
run_cmd.add_argument('plugin_name', nargs='?', default=None, help='Plugin name to run')
178178
run_cmd.add_argument('--workflow', action='store', nargs='?', default=False, dest='workflow')
179179
run_cmd.add_argument('--channel', action='store', nargs='?', default=False, dest='cmd_channel')
180+
run_cmd.add_argument('--ci-mode', action='store_true', dest='ci_mode')
180181
#run_cmd.add_argument('--cmd', action='store', nargs='?', default=False, dest='cmd')
181182
#run_cmd.add_argument('--pycode', action='store', nargs='?', default=False, dest='pycode')
182183

@@ -386,7 +387,8 @@ def start_handler(self):
386387
db_delete = False,
387388
db_update = False,
388389
db_rename = False,
389-
db_integrity_check = False
390+
db_integrity_check = False,
391+
ci_mode = False
390392
)
391393

392394
if len(sys.argv) > 1:

core/vmnf_settings.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,6 @@ settings:
7272
- tictrac
7373
- fff
7474
- pyserial
75+
- w2pyscanner
7576
utils:
7677
random_headers: res/random_headers.yaml

core/vmnf_shared_args.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ def args(self):
135135
vmnf_shared_parser.add_argument('--scan-api',action='store',dest='api_scan_enabled',nargs='?',const='ENV_FALLBACK',default=False)
136136
vmnf_shared_parser.add_argument('--api-scan',action='store',dest='api_scan_enabled',nargs='?',const='ENV_FALLBACK',default=False)
137137
vmnf_shared_parser.add_argument('--check-debug',action='store_true',dest='check_debug',default=False)
138+
vmnf_shared_parser.add_argument('--discovery-only',action='store_true',dest='discovery_only',default=False)
138139
# -------------------------------------------------------------------------------
139140
# > Scope setting - [ scope parser options ]
140141
# -------------------------------------------------------------------------------

res/vmnf_banners.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,13 @@ def sample_mode(mod_stat,_attrs_=['bold','blink']):
195195
││││
196196
""", 'blue', attrs=['blink', 'bold'])
197197

198-
fversion = colored(_version_, 'red')
198+
fversion = colored(_version_, None)
199199

200200
banner = '''
201201
┬ ┬┬┌┬┐┌─┐┌┐┌┌─┐
202202
┬ ┬┬┌┬┐┌─┐┌┐┌┌─┐
203203
└┐┌┘││││├─┤│││├─┤{}
204-
└┐┌┘││││├─┤│││├─┤
204+
└┐┌┘││││├─┤│││├─┤@s4dhulabs
205205
└┐┌┘││││├─┤│││├─┤
206206
└┘ ┴┴ ┴┴ ┴┘└┘┴ ┴
207207
└┘ ┴┴ ┴┴ ┴┘└┘┴ ┴'''.format(fversion)

0 commit comments

Comments
 (0)