diff options
author | Jesse Luehrs <doy@tozt.net> | 2020-05-03 03:30:59 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2020-05-03 03:30:59 -0400 |
commit | 6ebf7d55e4c553870306a70092cfb677c17429b9 (patch) | |
tree | 2d20288e44fa627159d0a4e578f0fb506d16f921 /src/bin/rbw | |
parent | 36b5107239b75136ce74799d87a645e153d95948 (diff) | |
download | rbw-6ebf7d55e4c553870306a70092cfb677c17429b9.tar.gz rbw-6ebf7d55e4c553870306a70092cfb677c17429b9.zip |
simplify
Diffstat (limited to 'src/bin/rbw')
-rw-r--r-- | src/bin/rbw/actions.rs | 3 | ||||
-rw-r--r-- | src/bin/rbw/sock.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/bin/rbw/actions.rs b/src/bin/rbw/actions.rs index 6de2fc6..01f448f 100644 --- a/src/bin/rbw/actions.rs +++ b/src/bin/rbw/actions.rs @@ -20,8 +20,7 @@ pub fn lock() -> anyhow::Result<()> { pub fn quit() -> anyhow::Result<()> { match crate::sock::Sock::connect() { Ok(mut sock) => { - let runtime_dir = rbw::dirs::runtime_dir(); - let pidfile = runtime_dir.join("pidfile"); + let pidfile = rbw::dirs::pid_file(); let mut pid = String::new(); std::fs::File::open(pidfile)?.read_to_string(&mut pid)?; let pid = nix::unistd::Pid::from_raw(pid.parse()?); diff --git a/src/bin/rbw/sock.rs b/src/bin/rbw/sock.rs index 1ba13ec..b3ff1d6 100644 --- a/src/bin/rbw/sock.rs +++ b/src/bin/rbw/sock.rs @@ -6,7 +6,7 @@ pub struct Sock(std::os::unix::net::UnixStream); impl Sock { pub fn connect() -> std::io::Result<Self> { Ok(Self(std::os::unix::net::UnixStream::connect( - rbw::dirs::runtime_dir().join("socket"), + rbw::dirs::socket_file(), )?)) } |