display-config #12
Merged
display-config #12
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
|
Oops. Sorry broke the logic. |
Saviq
suggested changes
Sep 27, 2018
snap/hooks/configure
Outdated
| @@ -12,6 +12,27 @@ EOT | |||
| let changes+=1 | |||
| fi | |||
|
|
|||
| # display-config | |||
| display_config=$(snapctl get display-config) | |||
| if [ -n "${display_config}" ]; then | |||
There was a problem hiding this comment.
Hmm so if we set it to empty, the file will remain, along with the "DO NOT EDIT" header... Maybe we could check if the file was written by us (i.e. has the # DO NOT EDIT header) and remove it if that's the case?
snap/hooks/configure
Outdated
| echo "# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN" > "$SNAP_DATA/miral-kiosk.display~" | ||
| echo "# USE 'snap set mir-kiosk display-config=...' INSTEAD" >> "$SNAP_DATA/miral-kiosk.display~" | ||
| echo "" >> "$SNAP_DATA/miral-kiosk.display~" | ||
| echo "${display_config}" >> "$SNAP_DATA/miral-kiosk.display~" |
There was a problem hiding this comment.
I suppose $SNAP_DATA/miral-kiosk.display deserves a variable of its own?
Saviq
approved these changes
Sep 28, 2018
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.
Add logic for an optional "display-config" setting.
If "snapctl get display-config" is set we compare with the
.displayfile (if it exists) and unless they are the same overwrite and restart.