simplify

4 files changed, 7 insertions, 19 deletions

diff --git a/src/bin/rbw-agent/daemon.rs b/src/bin/rbw-agent/daemon.rs
index f87d0ec..923a217 100644
--- a/src/bin/rbw-agent/daemon.rs
+++ b/src/bin/rbw-agent/daemon.rs
@@ -1,5 +1,3 @@
-use anyhow::Context as _;
-
 pub struct StartupAck {
     writer: std::os::unix::io::RawFd,
 }
@@ -20,25 +18,20 @@ impl Drop for StartupAck {
 }
 
 pub fn daemonize() -> anyhow::Result<StartupAck> {
-    let runtime_dir = rbw::dirs::runtime_dir();
-    std::fs::create_dir_all(&runtime_dir)
-        .context("failed to create runtime directory")?;
+    rbw::dirs::make_all()?;
 
-    let data_dir = rbw::dirs::data_dir();
-    std::fs::create_dir_all(&data_dir)
-        .context("failed to create data directory")?;
     let stdout = std::fs::OpenOptions::new()
         .append(true)
         .create(true)
-        .open(data_dir.join("agent.out"))?;
+        .open(rbw::dirs::agent_stdout_file())?;
     let stderr = std::fs::OpenOptions::new()
         .append(true)
         .create(true)
-        .open(data_dir.join("agent.err"))?;
+        .open(rbw::dirs::agent_stderr_file())?;
 
     let (r, w) = nix::unistd::pipe()?;
     let res = daemonize::Daemonize::new()
-        .pid_file(runtime_dir.join("pidfile"))
+        .pid_file(rbw::dirs::pid_file())
         .stdout(stdout)
         .stderr(stderr)
         .exit_action(move || {
diff --git a/src/bin/rbw-agent/sock.rs b/src/bin/rbw-agent/sock.rs
index bb2d6fb..311176c 100644
--- a/src/bin/rbw-agent/sock.rs
+++ b/src/bin/rbw-agent/sock.rs
@@ -43,11 +43,7 @@ impl Sock {
 }
 
 pub fn listen() -> anyhow::Result<tokio::net::UnixListener> {
-    let runtime_dir = rbw::dirs::runtime_dir();
-    std::fs::create_dir_all(&runtime_dir)
-        .context("failed to create runtime dir")?;
-
-    let path = runtime_dir.join("socket");
+    let path = rbw::dirs::socket_file();
     // if the socket already doesn't exist, that's fine
     let _ = std::fs::remove_file(&path);
     let sock = tokio::net::UnixListener::bind(&path)
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(),
         )?))
     }