-
Notifications
You must be signed in to change notification settings - Fork 5
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
Add the ability to use concat for zshrc #31
base: master
Are you sure you want to change the base?
Conversation
Thanks for creating the pr. can you please rebase it to master. I will review it as soon as I have some free time. |
02541f5
to
625399b
Compare
I rebased my commit for the change involved in #34. |
625399b
to
fe6012d
Compare
I rebased the branch to get the changes from e57a0f9. I moved the default value of |
@Safranil , looks like some tests are failing, can you check your PR please? |
I am not familiar with |
fe6012d
to
9309f6d
Compare
It's specific to this module, with this file you can customize your ZSH while Puppet is managing the I added this for some use case by a customer of me. |
Puppet 6 on Ubuntu 20.04I don't really understand why the build is not working... The tests commands doesn't seem to be the same on my PR and on master. Master : https://app.travis-ci.com/github/rehanone/puppet-ohmyzsh/jobs/588776307#L697 On master and PR the command On master the log is (L717):
But on my PR the log is (L727):
And finally
My PR go on I don't know where is set this repository. Puppet 6 on Debian 8I don't know what is going wrong with my PR. |
Looks like the tests are falling for some expired cert. I will check if I can fix it. Also, I like the idea of having a .local file with customizations but i think it should start simple. perhaps just one concat file to start off. can you please simplify this PR and split it so it is easier to see all the changes? |
9309f6d
to
4715742
Compare
I have done it, I removed the local part and focused the PR on the concat functionality. Edit: I see the build is now passing for Puppet 6 on Ubuntu 20.04, but the same problem as before occur on Debian 8. |
I have removed debian 8 from tests. It looks like that image is not on dockerhub anymore. Try to rebase now. |
e24c797
to
f6ef9a2
Compare
Done. |
2484725
to
ea0dafd
Compare
I simplified my PR to just include a base for working with the concat module. I also split the concat and the classic method in two sub resources for a better readability. I see the CI fail on the documentation on files without any docs prior my PR, I will do a second PR to add the missing documentation. |
4a01f8c
to
69f1065
Compare
And also add missing documentation
69f1065
to
00a633a
Compare
This will add the ability to give a preconfigured ZSH for the user and allow the configuration of Powerline instant prompt as it need to be on top of the zshrc file This commit also include an example code for this case
00a633a
to
35e71f0
Compare
This will add the ability to give a preconfigured ZSH for the user and allow the configuration of Powerline instant prompt as it need to be on top of the zshrc file This commit also include an example code for this case
@rehanone, can you tell me if this changes will be merged in the module? |
Allow concat 8.x and 9.x
This will add the ability to give a preconfigured ZSH for the user using fragment instead of a full flat file.
If concat is used, a second file is added in the user directory named
.zshrc.local
. This file allow the user to customize his zshrc without losing changes.This allow the configuration of Powerline instant prompt as it need to be on top of the zshrc file
Exemple: