From 9518f65c05b1cba07daf55b574fdf70191f0cb0e Mon Sep 17 00:00:00 2001
From: jpattWPC <jpatten@westparkcom.net>
Date: Wed, 19 Oct 2022 11:32:23 -0500
Subject: [PATCH] Fix build environment, version bump

---
 dist/createmsi.py   | 7 ++++---
 dist/vdiclient.json | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dist/createmsi.py b/dist/createmsi.py
index 4f76384..5fe8bc6 100644
--- a/dist/createmsi.py
+++ b/dist/createmsi.py
@@ -304,7 +304,8 @@ class PackageGenerator:
 			})
 
 	def path_to_id(self, pathname):
-			return pathname.replace('\\', '_').replace('/', '_').replace('#', '_').replace('-', '_')																								   
+			return pathname.replace('\\', '_').replace('/', '_').replace('#', '_').replace('-', '_').replace("+", "__")
+	
 	def create_xml(self, nodes, current_dir, parent_xml_node, staging_dir):
 		cur_node = nodes[current_dir]
 		if cur_node.files:
@@ -327,7 +328,7 @@ class PackageGenerator:
 				})
 			self.component_num += 1
 			for f in cur_node.files:
-				file_id = self.path_to_id(os.path.join(current_dir, f)).replace("+", "__")
+				file_id = self.path_to_id(os.path.join(current_dir, f))
 				ET.SubElement(comp_xml_node, 'File', {
 					'Id': file_id,
 					'Name': f,
@@ -335,7 +336,7 @@ class PackageGenerator:
 				})
 
 		for dirname in cur_node.dirs:
-			dir_id = os.path.join(current_dir, dirname).replace('\\', '_').replace('/', '_')
+			dir_id = self.path_to_id(os.path.join(current_dir, dirname))
 			dir_node = ET.SubElement(parent_xml_node, 'Directory', {
 				'Id': dir_id,
 				'Name': dirname,
diff --git a/dist/vdiclient.json b/dist/vdiclient.json
index 1df087e..b31fd3a 100644
--- a/dist/vdiclient.json
+++ b/dist/vdiclient.json
@@ -1,6 +1,6 @@
 {
 	"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
-	"version" : "1.0.8",
+	"version" : "1.0.9",
 	"product_name" : "VDI Client",
 	"manufacturer" : "Josh Patten",
 	"name" : "VDI Client",