Ensure $DISPLAY exists for xsel or xclip + add cygwin /dev/clipboard … #70
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
|
The additions of $DISPLAY and cygwin support should two separate commits. |
|
PR #58 implements tests for $DISPLAY. |
docwhat
suggested changes
May 4, 2017
| Support still exists for the following if desired: | ||
| - `putclip` command <br /> | ||
| Get the command by installing `cygutils-extra` package with Cygwin's | ||
| `setup*.exe`. |
There was a problem hiding this comment.
Maybe something simpler like:
If you have `putclip` (from the `cygutils-extra` package) then that will be used.
Otherwise it will fall back to using `/dev/clipboard`.
| @@ -110,14 +110,16 @@ clipboard_copy_command() { | |||
| else | |||
| echo "pbcopy" | |||
| fi | |||
| elif command_exists "xclip"; then | |||
| elif command_exists "xclip" && [ -n "$DISPLAY" ]; then # only works if $DISPLAY set | |||
There was a problem hiding this comment.
Please remove. PR #58 handles this.
| local xclip_selection="$(yank_selection)" | ||
| echo "xclip -selection $xclip_selection" | ||
| elif command_exists "xsel"; then | ||
| elif command_exists "xsel" && [ -n "$DISPLAY" ]; then # also required $DISPLAY |
There was a problem hiding this comment.
Please remove. PR #58 handles this.
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.
…support.
xsel and xclip both exist for cygwin when cygwin/X is installed, but it is much less common to have the X server running. Ensure that the $DISPLAY environment variable is set when determining which command to pick.
Additionally, cygwin has a built-in virtual device called /dev/clipboard that we can leverage instead of requiring putclip to be installed. Added support for that.
If you would like the test for $DISPLAY to be handled in another manner, I am open to editing this PR to meet those needs, but this worked in both my linux and windows/cygwin environment after the changes as is.