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.

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

fix: resolve two issues with the Zap installation script #133

Merged
merged 2 commits into from
Apr 29, 2023
Merged

Conversation

wintermi
Copy link
Contributor

Resolve the following two issues with the Zap installation script

  1. Move the check to see if Zap is already installed to before any changes to the .zshrc file are made.

  2. Change the launch of a new zsh session to rather reread the .zshrc file to maintain variables, history and allow the install script to be launched from an automation script. This resolves issue Disable automatic launch of a new zsh session after installation. #132

… changes to the .zshrc file is made.

fix: change the launch of a new zsh session to rather reread the .zshrc file to maintain variables, history and allow the install script to be launched from an automation script.
Copy link
Member

@mamaraddio mamaraddio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good but for clarity of the code maybe should be better to use

[[ $? -eq 0 ]] && source "$ZSHRC" || return

What do you think?

@mamaraddio mamaraddio linked an issue Apr 29, 2023 that may be closed by this pull request
Copy link
Member

@mamaraddio mamaraddio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@mamaraddio mamaraddio merged commit d8f9741 into master Apr 29, 2023
@mamaraddio mamaraddio deleted the wintermi branch April 29, 2023 14:48
mamaraddio added a commit that referenced this pull request May 2, 2023
* fix: resolve two issues with the Zap installation script (#133)

* feat: move the check to see if Zap is already installed to before any changes to the .zshrc file is made.
fix: change the launch of a new zsh session to rather reread the .zshrc file to maintain variables, history and allow the install script to be launched from an automation script.

* fix: change '.' to 'source'

* feat: cleanup updating all plugins output (#135)

---------

Co-authored-by: Matthew Winter <33818+wintermi@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disable automatic launch of a new zsh session after installation.
2 participants