Reorganize how clink settings are loaded #794
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jankatins
force-pushed
the
793-clink-settings
branch
from
c932222
to
143d266
Compare
|
Just a note: the current setup is broken as it places the clink files (mainly |
4bfdf04 moved all clink config files to vendor/ and therefore the files in config/ were not used and .history was also moved to vendor/. The new arrangement uses `--script` to load our own clink.lua file which in turn as the first thing loads the original clink.lua file. The user defined files are again in config/. As clink regenerates these files, if they are not present, this also means that we don't need to include the settings file in the git repo and therefore don't overwrite it on updates.
Introduce a header like in the rest of the scripts that this file is overwritten on updates and should not be modified.
jankatins
force-pushed
the
793-clink-settings
branch
from
143d266
to
fe45b18
Compare
|
ping? |
|
I need to figure this out, a lot of contradicting PRs and changes. |
|
@MartiUK why not just merge this? Other PRs have to be rebased on that but this at least fixes the problem, no? |
|
Fair enough |
MartiUK
added a commit
that referenced
this pull request
Feb 1, 2016
Reorganize how clink settings are loaded
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
4bfdf04 moved all clink config files
to vendor/ and therefore the files in config/ were not used and .history
was also moved to vendor/.
The new arrangement uses
--scriptto load our own clink.lua file which inturn as the first thing loads the original clink.lua file. The user defined
files are again in config/. As clink regenerates these files, if they are not
present, this also means that we don't need to include the settings file
in the git repo and therefore don't overwrite it on updates.
Closes: #793