thomas/vdiclient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build environment, version bump

Browse Source
This commit is contained in:
jpattWPC 2022-10-19 11:32:23 -05:00
parent 02df87523d
commit 9518f65c05
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/createmsi.py vendored
View File

@ -304,7 +304,8 @@ class PackageGenerator:
}) })
def path_to_id(self, pathname): 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): def create_xml(self, nodes, current_dir, parent_xml_node, staging_dir):
cur_node = nodes[current_dir] cur_node = nodes[current_dir]
if cur_node.files: if cur_node.files:
@ -327,7 +328,7 @@ class PackageGenerator:
}) })
self.component_num += 1 self.component_num += 1
for f in cur_node.files: 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', { ET.SubElement(comp_xml_node, 'File', {
'Id': file_id, 'Id': file_id,
'Name': f, 'Name': f,
@ -335,7 +336,7 @@ class PackageGenerator:
}) })
for dirname in cur_node.dirs: 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', { dir_node = ET.SubElement(parent_xml_node, 'Directory', {
'Id': dir_id, 'Id': dir_id,
'Name': dirname, 'Name': dirname,

2
dist/vdiclient.json vendored
View File

@ -1,6 +1,6 @@
{ {
"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8", "upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
"version" : "1.0.8", "version" : "1.0.9",
"product_name" : "VDI Client", "product_name" : "VDI Client",
"manufacturer" : "Josh Patten", "manufacturer" : "Josh Patten",
"name" : "VDI Client", "name" : "VDI Client",