Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SHACK-353] Enable CWA on Windows #241

Merged
merged 3 commits into from
Sep 13, 2018
Merged

[SHACK-353] Enable CWA on Windows #241

merged 3 commits into from
Sep 13, 2018

Commits on Sep 13, 2018

  1. Update workstation software definition 

    This changes the installed location of chef-workstation-app to
$install_dir/components/chef-workstation-app as we switch over
to including the unpacked application in the installer package.

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
    @marcparadise
    marcparadise committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    a386c6f View commit details
    Browse the repository at this point in the history

  2. Add Chef Workstation App installer feature for Windows 

    This splits the Chef Workstation windows installer into
'Chef Workstation' and 'Experimental Features'.

'Chef Workstation' contains the existing items for this package,
while 'Experimental Features' currently provides the option to
install Chef Workstation Tray.  Selecting this will install
autostart, desktop, and Start shortcuts for it.

This is intended to be a short-term approach while we work on
moving these types of feature flags into configuration and the
Workstation App itself.

Additional changes:

* renames the shell shortcut "Chef Workstation" to "Chef
  Workstation Command Prompt". This is more in line with recent
  discussions around naming, and avoids confusion between a shortcut
  called "Chef Workstation" and one named "Chef Workstation App".
* adds clarifying wording to Windows installation components and
  descriptions now that there can be more than one 'Chef Workstation' icon
* shorten key names

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
    @marcparadise
    marcparadise committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    27a4f23 View commit details
    Browse the repository at this point in the history

  3. Correct wix localization resources usage 

    Also applies consistent formatting to source.wxs.erb

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
    @marcparadise
    marcparadise committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    64f33da View commit details
    Browse the repository at this point in the history