Fixed a bug with determining groovy name/namespace when single-quotes…

… were used
dcmeglio · Apr 22, 2020 · 5e52982 · 5e52982
1 parent 9f04d1a
commit 5e52982
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/HubitatPackageManagerTools/Executors/ManifestExecutorBase.cs b/HubitatPackageManagerTools/Executors/ManifestExecutorBase.cs
@@ -9,8 +9,8 @@ namespace HubitatPackageManagerTools.Executors
 {
     internal class ManifestExecutorBase : ExecutorBase
     {
-        protected static Regex nameMatcher = new Regex("definition\\s*?\\(.*?name:\\s*\"([^\"]*)\"", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
-        protected static Regex namespaceMatcher = new Regex("definition\\s*?\\(.*?namespace:\\s*\"([^\"]*)\"", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
+        protected static Regex nameMatcher = new Regex(@"definition\s*?\(.*?name:\s*(?:(?:""([^""]*)"")|(?:'([^']*)'))", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
+        protected static Regex namespaceMatcher = new Regex(@"definition\s*?\(.*?namespace:\s*(?:(?:""([^""]*)"")|(?:'([^']*)'))", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
         protected JObject OpenExistingManifest(ManifestOptionsBase options)
         {
             using var file = File.OpenText(options.ManifestFile);

diff --git a/HubitatPackageManagerTools/HubitatPackageManagerTools.csproj b/HubitatPackageManagerTools/HubitatPackageManagerTools.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>hpm</AssemblyName>
-    <Version>1.2.0</Version>
+    <Version>1.2.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">