fix
This commit is contained in:
parent
051cbfecfb
commit
0331672f92
@ -23,7 +23,8 @@ parser.add_argument('--printExports', '-e',
|
|||||||
default=False,
|
default=False,
|
||||||
required=False)
|
required=False)
|
||||||
parser.add_argument('--exportFormat', '-f',
|
parser.add_argument('--exportFormat', '-f',
|
||||||
help='Print exports in >bash< or >powershell< format, to be used in backticks or with Invoke-Expression',
|
help='Print exports in >bash< or >powershell< format, to be used in '
|
||||||
|
'backticks or with Invoke-Expression',
|
||||||
default='bash',
|
default='bash',
|
||||||
required=False)
|
required=False)
|
||||||
parser.add_argument('--verbose', '-v',
|
parser.add_argument('--verbose', '-v',
|
||||||
@ -41,7 +42,6 @@ printExports = args.printExports
|
|||||||
exportFormat = args.exportFormat
|
exportFormat = args.exportFormat
|
||||||
|
|
||||||
r = re.compile(r'^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
|
r = re.compile(r'^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
|
||||||
# r = re.compile('^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
|
|
||||||
|
|
||||||
if verbose:
|
if verbose:
|
||||||
print("Version to validate: {}".format(versionToValidate))
|
print("Version to validate: {}".format(versionToValidate))
|
||||||
@ -73,11 +73,8 @@ if m:
|
|||||||
elif exportFormat == "powershell":
|
elif exportFormat == "powershell":
|
||||||
print("set {} {}".format(i.upper(), '""' if m.group(i) is None else m.group(i)))
|
print("set {} {}".format(i.upper(), '""' if m.group(i) is None else m.group(i)))
|
||||||
|
|
||||||
|
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
else:
|
else:
|
||||||
if verbose:
|
if verbose:
|
||||||
print("Version is invalid")
|
print("Version is invalid")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
Reference in New Issue
Block a user