add dbus and dri

lib/args.nim

@@ -1,13 +1,14 @@
+import parseopt
 import options
 import os
 
 type Args* = object
   name*: Option[string]
-  cmd*: Option[seq[string]]
+  cmd*: Option[string]
   profile*: Option[string]
 
-proc getCmd*(args: Args): seq[string] =
-  return args.cmd.get(@[getEnv("SHELL", "/bin/bash")])
+proc getCmd*(args: Args): string =
+  return args.cmd.get(getEnv("SHELL", "/bin/bash"))
 
 proc getProfile*(args: Args): string =
   if args.profile.isSome:
@@ -15,27 +16,30 @@ proc getProfile*(args: Args): string =
 
   return "default"
 
+proc parseOpt(args: var Args, key: string, value: string): bool =
+  case key
+  of "command", "c":
+    args.cmd = some(value)
+  of "profile", "p":
+    args.profile = some(value)
+  else:
+    return false
+
+  return true
+
 proc parseArgs*(): Option[Args] =
+  var p = initOptParser()
   var args = Args()
 
-  var command = newSeq[string]()
-  var i = 1
-
-  while i <= paramCount():
-    var arg = paramStr(i)
-
-    if arg == "--name":
-      args.name = some(paramStr(i + 1))
-      i += 2
-    elif arg == "--profile":
-      args.profile = some(paramStr(i + 1))
-      i += 2
-    else:
-      echo arg
-      command.add(arg)
-      i += 1
-
-  if command.len > 0:
-    args.cmd = some(command)
+  while true:
+    p.next()
+    case p.kind
+    of cmdEnd: break
+    of cmdShortOption, cmdLongOption:
+      if p.val == "" or args.parseOpt(p.key, p.val) == false:
+        echo "Invalid argument ", p.val
+        return
+    of cmdArgument:
+      args.name = some(p.key.string)
 
   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,26 +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=bwshell --name '$file' --profile gui /gi" "$application" > "$target/$file"
-  done
-}
-
-dirs=("/usr/share/applications" "$HOME/.local/share/applications")
-target="$1"
-
-mkdir -p "$target"
-
-for dir in "${dirs[@]}"; do
-  check_dir "$dir"
-done