add dbus and dri

lib/args.nim

@@ -4,11 +4,11 @@ import os
 
 type Args* = object
   name*: Option[string]
-  cmd*: Option[seq[string]]
+  cmd*: Option[string]
   profile*: Option[string]
 
-proc getCmd*(args: Args): seq[string] =
+proc getCmd*(args: Args): string =
-  return args.cmd.get(@[getEnv("SHELL", "/bin/bash")])
+  return args.cmd.get(getEnv("SHELL", "/bin/bash"))
 
 proc getProfile*(args: Args): string =
   if args.profile.isSome:
@@ -18,8 +18,8 @@ proc getProfile*(args: Args): string =
 
 proc parseOpt(args: var Args, key: string, value: string): bool =
   case key
-  of "name", "n":
+  of "command", "c":
-    args.name = some(value)
+    args.cmd = some(value)
   of "profile", "p":
     args.profile = some(value)
   else:
@@ -30,7 +30,6 @@ proc parseOpt(args: var Args, key: string, value: string): bool =
 proc parseArgs*(): Option[Args] =
   var p = initOptParser()
   var args = Args()
-  var command = newSeq[string]()
 
   while true:
     p.next()
@@ -41,9 +40,6 @@ proc parseArgs*(): Option[Args] =
         echo "Invalid argument ", p.val
         return
     of cmdArgument:
-      command.add(p.key.string)
+      args.name = some(p.key.string)
-
-  if command.len > 0:
-    args.cmd = some(command)
 
   return some(args)

lib/dbus.nim

@@ -10,10 +10,10 @@ type DbusProxy* = object
   socket*: string
   args: seq[string]
 
-proc exec*(proxy: DbusProxy): Process =
+proc exec*(proxy: var DbusProxy) =
   # todo: start dbus proxy in bwrap
   # todo: pass arguments as fd
-  startProcess("xdg-dbus-proxy", args = proxy.args,
+  proxy.process = startProcess("xdg-dbus-proxy", args = proxy.args,
     options = {poEchoCmd, poParentStreams, poUsePath})
 
 proc startDBusProxy*(config: Config, hostname: string): DbusProxy =
@@ -49,6 +49,6 @@ proc startDBusProxy*(config: Config, hostname: string): DbusProxy =
 
   proxy.args.add("--filter")
   proxy.args.add("--log")
-  proxy.process = proxy.exec()
+  proxy.exec()
 
   proxy

main.nim

@@ -5,10 +5,9 @@ import random
 
 proc main(): int =
   let args = parseArgs()
-  echo args
 
   if args.isNone:
-    echo "Usage: bwshell --name=sandbox_name --profile=profile <sandbox_cmd>"
+    echo "Usage: bwshell --command=cmd --profile=profile <sandbox_name>"
     return 1
   else:
     randomize()

scripts/applications.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-if [ $# -ne 1 ]; then
-  echo "Usage: $0 <target_dir>"
-  exit 1
-fi
-
-check_dir() {
-  local dir=$1
-  local file
-
-  for application in "$dir/"*; do
-    file="$(basename "$application")"
-
-    sed "s/Exec=/Exec=bwrap --name='$file' --profile=gui /gi" "$application" > "$target/$file"
-  done
-}
-
-dirs=("/usr/share/applications" "$HOME/.local/share/applications")
-target="$1"
-
-for dir in "${dirs[@]}"; do
-  check_dir "$dir"
-done