Adjusted regex

HashLoad · Nov 4, 2019 · 5a127cc · 5a127cc
1 parent a597969
commit 5a127cc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -13,7 +13,7 @@ func EnsureDependencyOfArgs(pkg *models.Package, args []string) {
 		dependency := ParseDependency(args[e])
 		dependency = strings.ToLower(dependency)
 
-		re := regexp.MustCompile(`(?m)(?P<host>.*)(\:(?P<version>[\^~]?[\d.]{1,5}))|(?P<host_only>.*)$`)
+		re := regexp.MustCompile(`(?m)(?:(?P<host>.*)(?::(?P<version>[\^~]?(?:(?:(?:[0-9]+)(?:\.[0-9]+)(?:\.[0-9]+)?))))$|(?P<host_only>.*))`)
 		match := make(map[string]string)
 		split := re.FindStringSubmatch(dependency)
 

diff --git 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