From 7e4c0d660a89d25b935007e420fcf9f33a92ce30 Mon Sep 17 00:00:00 2001
From: Keagan McClelland <keagan.mcclelland@gmail.com>
Date: Mon, 16 May 2022 15:37:02 -0600
Subject: [PATCH] fix paths

---
 backend/src/install/cleanup.rs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/backend/src/install/cleanup.rs b/backend/src/install/cleanup.rs
index 04f491937..282a4ac93 100644
--- a/backend/src/install/cleanup.rs
+++ b/backend/src/install/cleanup.rs
@@ -17,7 +17,7 @@ use crate::dependencies::{
 use crate::error::ErrorCollection;
 use crate::s9pk::manifest::{Manifest, PackageId};
 use crate::util::{Apply, Version};
-use crate::volume::PKG_VOLUME_DIR;
+use crate::volume::{asset_dir, script_dir, PKG_VOLUME_DIR};
 use crate::Error;
 
 pub struct UpdateDependencyReceipts {
@@ -148,23 +148,13 @@ pub async fn cleanup(ctx: &RpcContext, id: &PackageId, version: &Version) -> Res
             .await
             .apply(|res| errors.handle(res));
     }
-    let assets_path = ctx
-        .datadir
-        .join(PKG_VOLUME_DIR)
-        .join(id)
-        .join("assets")
-        .join(version.as_str());
+    let assets_path = asset_dir(&ctx.datadir, id, version);
     if tokio::fs::metadata(&assets_path).await.is_ok() {
         tokio::fs::remove_dir_all(&assets_path)
             .await
             .apply(|res| errors.handle(res));
     }
-    let scripts_path = ctx
-        .datadir
-        .join(PKG_VOLUME_DIR)
-        .join(id)
-        .join("scripts")
-        .join(version.as_str());
+    let scripts_path = script_dir(&ctx.datadir, id, version);
     if tokio::fs::metadata(&scripts_path).await.is_ok() {
         tokio::fs::remove_dir_all(&scripts_path)
             .await