-
Notifications
You must be signed in to change notification settings - Fork 112
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.
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
[SHACK-353] Enable CWA on Windows #241
Conversation
e45b2df
to
a0f874e
Compare
This should be held out of merge until after #7 |
ce404ea
to
d46cc2d
Compare
This is pending a commit clean-up - some of the localization changes got pushed to the wrong branch. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks ok to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few questions just to make sure I understand this. But overall LGTM! And the most important thing is whether it works
<Environment Id="Environment" | ||
Name="PATH" Action="set" Part="last" System="yes" Value="[PROJECTLOCATIONBIN]" /> | ||
</Component> | ||
<Component Id="StartChefWSPowershellShortcut" Guid="{69EF5736-ED67-45B3-887A-FBFC0AB6DA13}" > |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nix me if this is pedantic. But could we refer to this as ChefWsApp
and start-chef-ws-app.ps1
in this component to be most clear?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This isn't for the app - this is the config for the powershell shortcut. I can rename the component itself though, "start-ws.ps1" isn't really "Start Chef Workstation". chef-ws-powershell.ps1
?
I will do this in a separate minor PR to avoid more rebasing of downstream branches.
</Component> | ||
</Directory> | ||
<Directory Id="COMPONENTS" Name="components"> | ||
<Directory Id="WSAPPDIR" Name="chef-workstation-app"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this Directory
tag doing? Is it creating components/chef-workstation-app
as part of the install? Or just listing it so that Wix knows about it and could (EG) delete it on uninstall?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We reference it later as WSAPPDIR in the CWA shortcut setup, to provide the location for the binary.
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>
d46cc2d
to
69d2f4d
Compare
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>
69d2f4d
to
27a4f23
Compare
Also applies consistent formatting to source.wxs.erb Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
Description
This adds a "Chef Workstation App" feature to the Windows
Installer. It provides a 'run on login' component that will
add CWA to common startup
If Start menu items are selected, it will include this
shortcut there as well.
This branch also 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".
This also changes the CWA tray app package location to $install_path/components/chef-workstation-app instead of $install_path/installers - it's more accurate.
Check List
www/site/content/docs/ has been updated with any relevant changes