diff --git a/consts/consts.go b/consts/consts.go index 05ee9cf..a555de3 100644 --- a/consts/consts.go +++ b/consts/consts.go @@ -38,7 +38,7 @@ const XmlTagNamePropertyAttributeValue string = "'$(Base)'!=''" const XmlTagNameLibraryPath string = "DCC_UnitSearchPath" -const Version string = "v3.0.1" +const Version string = "v3.0.2" const BossInternalDir = "internal." const BossInternalDirOld = "{internal}" diff --git a/core/installer/utils.go b/core/installer/utils.go index 13d4564..d891af9 100644 --- a/core/installer/utils.go +++ b/core/installer/utils.go @@ -13,7 +13,7 @@ func EnsureDependencyOfArgs(pkg *models.Package, args []string) { dependency := ParseDependency(args[e]) dependency = strings.ToLower(dependency) - re := regexp.MustCompile(`(?m)(?P.*)(\:(?P[\^~]?[\d.]{1,5}))|(?P.*)$`) + re := regexp.MustCompile(`(?m)(?:(?P.*)(?::(?P[\^~]?(?:(?:(?:[0-9]+)(?:\.[0-9]+)(?:\.[0-9]+)?))))$|(?P.*))`) match := make(map[string]string) split := re.FindStringSubmatch(dependency) diff --git a/installer/boss.iss b/installer/boss.iss index c14f18f..a8b763d 100644 --- a/installer/boss.iss +++ b/installer/boss.iss @@ -1,5 +1,5 @@ #define BossName "Boss" -#define BossVersion "3.0.1" +#define BossVersion "3.0.2" #define BossPublisher "Hashload" #define BossURL "https://github.com/HashLoad/boss" @@ -14,7 +14,7 @@ AppPublisher={#BossPublisher} AppPublisherURL={#BossURL} AppSupportURL={#BossURL} AppUpdatesURL={#BossURL} -DefaultDirName={pf}\{#BossName} +DefaultDirName={commonpf}\{#BossName} DefaultGroupName={#BossName} DisableProgramGroupPage=yes LicenseFile=LICENSE.txt