Fix various typos in winstall. Put program files shortcuts into folder.

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
chef · Sep 11, 2018 · e45b2df · e45b2df
1 parent 68e8c99
commit e45b2df
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 22 deletions.
diff --git a/omnibus/resources/chef-workstation/msi/localization-en-us.wxl.erb b/omnibus/resources/chef-workstation/msi/localization-en-us.wxl.erb
@@ -19,6 +19,7 @@
   <String Id="VerifyReadyDlgInstallTitle">{\WixUI_Font_Title_White}Ready to install [ProductName]</String>
 
   <String Id="FeatureMainName"><%= friendly_name %></String>
+  <String Id="FeatureMainDesc">Install Chef Workstation<%= friendly_name %>
   <String Id="FeaturePSModuleName"><%= friendly_name %> PowerShell wrappers</String>
 
   <String Id="FeatureChefWSEnvHacks">Chef Workstation Environment Customizations</String>

diff --git a/omnibus/resources/chef-workstation/msi/source.wxs.erb b/omnibus/resources/chef-workstation/msi/source.wxs.erb
@@ -130,23 +130,26 @@
 					</Directory>
 				</Directory>
 			</Directory>
-			<Directory Id="ProgramMenuFolder">
-				<Component Id="PowershellStartMenuShortcut" Guid="{6DD3FFF3-E009-40E7-B1C2-EF606B941CCD}">
-					<Shortcut Id="PowershellStartMenuShortcutDef"
-						Name="!(loc.ChefWSPowershellShortcutDefName)"
-						Description="!(loc.ChefWSPowershellShortcutDefDesc)"
-						Target="[WindowsFolder]\System32\WindowsPowerShell\v1.0\powershell.exe"
-						Arguments="-NoProfile -ExecutionPolicy Bypass -File [#StartChefWSScript]"
-						Show="minimized"
-						Icon="cws.ico"/>
-				</Component>
-				<Component Id="ChefWSAppStartMenuShortcut" Guid="{6CFD92E5-B45F-48F2-AC17-54B647D65E66}">
-					<Shortcut Id="ChefWSAppStartMenuShortcutDef"
-						Name="!(loc.ChefWSAppShortcutName)"
-						Description="!(loc.ChefWSAppShortcutDesc)"
-						Target="[WSAPPDIR]\Chef Workstation App.exe"
-						Icon="cws.ico"/>
-				</Component>
+      <Directory Id="ProgramMenuFolder">
+        <!-- Place shortcuts grouped in a "Chef Workstation" folder in the Start menu -->
+        <Directory Id="ChefWorkstationFolder" Name="Chef Workstation">
+          <Component Id="PowershellStartMenuShortcut" Guid="{6DD3FFF3-E009-40E7-B1C2-EF606B941CCD}">
+            <Shortcut Id="PowershellStartMenuShortcutDef"
+              Name="!(loc.ChefWSPowershellShortcutDefName)"
+              Description="!(loc.ChefWSPowershellShortcutDefDesc)"
+              Target="[WindowsFolder]\System32\WindowsPowerShell\v1.0\powershell.exe"
+              Arguments="-NoProfile -ExecutionPolicy Bypass -File [#StartChefWSScript]"
+              Show="minimized"
+              Icon="cws.ico"/>
+          </Component>
+          <Component Id="ChefWSAppStartMenuShortcut" Guid="{6CFD92E5-B45F-48F2-AC17-54B647D65E66}">
+            <Shortcut Id="ChefWSAppStartMenuShortcutDef"
+              Name="!(loc.ChefWSAppShortcutName)"
+              Description="!(loc.ChefWSAppShortcutDesc)"
+              Target="[WSAPPDIR]\Chef Workstation App.exe"
+              Icon="cws.ico"/>
+          </Component>
+        </Directory>
 			</Directory>
 
 			<!-- This component puts the WS App in the common autostart folder [if the Feature is selected] -->
@@ -169,7 +172,8 @@
 						Arguments="-NoProfile -ExecutionPolicy Bypass -File [#StartChefWSScript]"
 						Show="minimized"
 						Icon="cws.ico"/>
-				</Component>
+        </Component>
+
 				<Component Id="ChefWSAppDesktopShortcut" Guid="91f753ca-d87b-4ef2-915c-2183bef16177">
 					<Shortcut Id="ChefWSAppDesktopShortcutDef"
 						Name="!(loc.ChefWSAppShortcutName)"
@@ -186,15 +190,17 @@
            [x] Start Menu Shortcut
            [x] Desktop Shortcut
          [x] Experimental Features
-           [x] Chef Workstation App
+           [x] Chef Workstation App (includes shortcuts and autostart)
     -->
-		<Feature Id="ChefWSFeature" Title="!(loc.FeatureMainName)" Absent="disallow" AllowAdvertise="no" Level="1" ConfigurableDirectory="INSTALLLOCATION">
+    <Feature Id="ChefWSFeature" Title="!(loc.FeatureMainName)"
+      Description="!(loc.FeatureMainDesc)"
+      Absent="disallow" AllowAdvertise="no" Level="1" ConfigurableDirectory="INSTALLLOCATION">
 			<ComponentGroupRef Id="ProjectDir" />
 			<ComponentRef Id="ChefWSPath" />
 			<ComponentRef Id="ChefPSModulePath" />
 			<ComponentRef Id="ChefPowerShellRegistryEntries" />
 			<Feature Id="ChefWSStartMenuPSShortcutFeature" Title="!(loc.FeatureChefWSStartMenuPSShortcut)"
-	             Description="!(loc.FeatureChefWSStartMenuPSShortcutDescription" Level="1" AllowAdvertise="no" >
+	             Description="!(loc.FeatureChefWSStartMenuPSShortcutDesc" Level="1" AllowAdvertise="no" >
 				<ComponentRef Id="StartChefWSPowershellShortcut" />
 				<ComponentRef Id="PowershellStartMenuShortcut" />
 			</Feature>
@@ -209,7 +215,7 @@
 		</Feature>
 
 		<Feature Id="ExperimentalFeatures" Title="!(loc.FeatureExperimental)" Description="!(loc.FeatureExperimentalDesc)" Level="1000" AllowAdvertise="no" Display="collapse">
-			<Feature Id="ExperimentalChefWSApp" Title="!(loc.FeatureExperimentalChefWS)" Description="!(loc.FeatureExperimentalChefWSDescription">
+			<Feature Id="ExperimentalChefWSApp" Title="!(loc.FeatureExperimentalChefWS)" Description="!(loc.FeatureExperimentalChefWSDesc">
 				<ComponentRef Id="ChefWSAppAutostartShortcut" />
 				<ComponentRef Id="ChefWSAppStartMenuShortcut" />
 				<ComponentRef Id="ChefWSAppDesktopShortcut" />