From c7e3e56bd2bebdb01e8511a48d84f51ed2c4dbd7 Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Sat, 14 Aug 2021 21:44:09 -0700
Subject: [PATCH] Fix a few silly errors

---
 backend/api.js                      |  3 ++-
 system/src/riju-system-privileged.c | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/backend/api.js b/backend/api.js
index 4beba0d..91d801c 100644
--- a/backend/api.js
+++ b/backend/api.js
@@ -52,6 +52,7 @@ export class Session {
     util.privilegedExec(this.context, bash(cmdline));
   privilegedPty = (cmdline) =>
     util.privilegedPty(this.context, bash(cmdline, { stty: true }));
+  privilegedTeardown = (cmdline) => util.privilegedTeardown(this.context);
 
   setup = async () => {
     try {
@@ -449,7 +450,7 @@ export class Session {
       if (this.container) {
         this.container.proc.kill();
       }
-      await this.run(this.privilegedTeardown({ uuid }));
+      await this.run(this.privilegedTeardown());
       allSessions.delete(this);
       this.ws.terminate();
     } catch (err) {
diff --git a/system/src/riju-system-privileged.c b/system/src/riju-system-privileged.c
index 6ea744b..b3f2bcd 100644
--- a/system/src/riju-system-privileged.c
+++ b/system/src/riju-system-privileged.c
@@ -418,10 +418,12 @@ void teardown(char *uuid)
     if (asprintf(&cmdline, "rm -rf /var/cache/riju/shares/%s", uuid) < 0)
       die("asprintf failed");
   } else {
-    cmdline = "comm -23 <(sudo ls /var/cache/riju/shares | sort) <(docker ps "
-              "-f label=riju.category=user-session --format \"{{ .Labels }}\" "
-              "| grep -Eo 'riju\\.user-session=[a-z0-9]+' | sed -E "
-              "'s/^[^=]+=//') | (cd /var/cache/riju/shares; xargs rm -rf)";
+    cmdline =
+        "comm -23 <(sudo ls /var/cache/riju/shares | sort) <(docker ps "
+        "-f label=riju.category=user-session --format \"{{ .Labels }}\" "
+        "| grep -Eo 'riju\\.user-session=[a-z0-9]+' | sed -E "
+        "'s/^[^=]+=//' | sort) | (cd /var/cache/riju/shares 2>/dev/null && "
+        "xargs rm -rf || :)";
   }
   char *argv[] = {"bash", "-c", cmdline, NULL};
   execvp(argv[0], argv);