Skip to content

Commit

Permalink
Merge pull request #61 from conradkleinespel/publish-2.9
Browse files Browse the repository at this point in the history
Bump version to 2.9.0
  • Loading branch information
conradkleinespel authored Jan 25, 2021
2 parents cc85601 + 101a00c commit 5ea1f5a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rooster"
version = "2.8.6"
version = "2.9.0"
authors = ["Conrad Kleinespel <[email protected]>"]
license = "Apache-2.0"
repository = "https://github.com/conradkleinespel/rooster"
Expand Down
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,8 @@ curl https://sh.rustup.rs -sSf | sh -s -- -y
cargo install --root /usr rooster
```

On **Wayland**:

install [wl-clipboard](https://github.com/bugaevc/wl-clipboard)

Make sure you have the following environment variable set: `XDG_SESSION_TYPE=wayland`

If you use **Wayland** instead of X11, install [wl-clipboard](https://github.com/bugaevc/wl-clipboard) and make sure you have the following
environment variable set: `XDG_SESSION_TYPE=wayland`.

For other distributions, the various Docker files can help you find which dependencies you need.

Expand Down
7 changes: 3 additions & 4 deletions src/clip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ pub fn copy_to_clipboard(s: &SafeString) -> Result<(), ()> {
pub fn copy_to_clipboard(s: &SafeString) -> Result<(), ()> {
use quale::which;
use shell_escape;
use std::process::Command;
use std::env;
use std::process::Command;

let password = SafeString::new(shell_escape::escape(s.deref().into()).into());

Expand Down Expand Up @@ -101,7 +101,7 @@ pub fn copy_to_clipboard(s: &SafeString) -> Result<(), ()> {
}
}
None => Err(()),
}
},
}
}

Expand All @@ -110,7 +110,7 @@ pub fn copy_to_clipboard(s: &SafeString) -> Result<(), ()> {
let s = wayland_clipboards(&password);
match s {
Ok(_) => Ok(()),
Err(_) => x11_clipboards(&password)
Err(_) => x11_clipboards(&password),
}
}
_ => x11_clipboards(&password),
Expand Down Expand Up @@ -173,4 +173,3 @@ pub fn confirm_password_retrieved<
}
}
}

2 changes: 1 addition & 1 deletion src/shell_escape.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
//! Escape characters that may have special meaning in a shell.
#![doc(html_root_url="https://docs.rs/shell-escape/0.1")]
#![doc(html_root_url = "https://docs.rs/shell-escape/0.1")]

use std::borrow::Cow;
use std::env;
Expand Down

0 comments on commit 5ea1f5a

Please sign in to comment.