Compare commits
1 Commits
9cad6fc050
...
67ea99cd38
Author | SHA1 | Date |
---|---|---|
Martin | 67ea99cd38 |
16
lib/args.nim
16
lib/args.nim
|
@ -4,11 +4,11 @@ import os
|
||||||
|
|
||||||
type Args* = object
|
type Args* = object
|
||||||
name*: Option[string]
|
name*: Option[string]
|
||||||
cmd*: Option[string]
|
cmd*: Option[seq[string]]
|
||||||
profile*: Option[string]
|
profile*: Option[string]
|
||||||
|
|
||||||
proc getCmd*(args: Args): string =
|
proc getCmd*(args: Args): seq[string] =
|
||||||
return args.cmd.get(getEnv("SHELL", "/bin/bash"))
|
return args.cmd.get(@[getEnv("SHELL", "/bin/bash")])
|
||||||
|
|
||||||
proc getProfile*(args: Args): string =
|
proc getProfile*(args: Args): string =
|
||||||
if args.profile.isSome:
|
if args.profile.isSome:
|
||||||
|
@ -18,8 +18,8 @@ proc getProfile*(args: Args): string =
|
||||||
|
|
||||||
proc parseOpt(args: var Args, key: string, value: string): bool =
|
proc parseOpt(args: var Args, key: string, value: string): bool =
|
||||||
case key
|
case key
|
||||||
of "command", "c":
|
of "name", "n":
|
||||||
args.cmd = some(value)
|
args.name = some(value)
|
||||||
of "profile", "p":
|
of "profile", "p":
|
||||||
args.profile = some(value)
|
args.profile = some(value)
|
||||||
else:
|
else:
|
||||||
|
@ -30,6 +30,7 @@ proc parseOpt(args: var Args, key: string, value: string): bool =
|
||||||
proc parseArgs*(): Option[Args] =
|
proc parseArgs*(): Option[Args] =
|
||||||
var p = initOptParser()
|
var p = initOptParser()
|
||||||
var args = Args()
|
var args = Args()
|
||||||
|
var command = newSeq[string]()
|
||||||
|
|
||||||
while true:
|
while true:
|
||||||
p.next()
|
p.next()
|
||||||
|
@ -40,6 +41,9 @@ proc parseArgs*(): Option[Args] =
|
||||||
echo "Invalid argument ", p.val
|
echo "Invalid argument ", p.val
|
||||||
return
|
return
|
||||||
of cmdArgument:
|
of cmdArgument:
|
||||||
args.name = some(p.key.string)
|
command.add(p.key.string)
|
||||||
|
|
||||||
|
if command.len > 0:
|
||||||
|
args.cmd = some(command)
|
||||||
|
|
||||||
return some(args)
|
return some(args)
|
|
@ -10,7 +10,7 @@ proc sandboxExec*(args: Args) =
|
||||||
var call = BwrapCall()
|
var call = BwrapCall()
|
||||||
var configPath = none(string)
|
var configPath = none(string)
|
||||||
|
|
||||||
let hostname = args.name.get(getProfile(argst ))
|
let hostname = args.name.get(getProfile(args))
|
||||||
|
|
||||||
if args.name.isSome:
|
if args.name.isSome:
|
||||||
let name = args.name.unsafeGet
|
let name = args.name.unsafeGet
|
||||||
|
@ -18,7 +18,6 @@ proc sandboxExec*(args: Args) =
|
||||||
let sandboxFiles = sandboxPath.joinPath("files")
|
let sandboxFiles = sandboxPath.joinPath("files")
|
||||||
let userConfig = sandboxPath.joinPath("config.json")
|
let userConfig = sandboxPath.joinPath("config.json")
|
||||||
|
|
||||||
|
|
||||||
createDir(sandboxFiles)
|
createDir(sandboxFiles)
|
||||||
call.addArg("--bind", sandboxFiles, getHomeDir())
|
call.addArg("--bind", sandboxFiles, getHomeDir())
|
||||||
|
|
||||||
|
|
3
main.nim
3
main.nim
|
@ -4,9 +4,10 @@ import options
|
||||||
|
|
||||||
proc main(): int =
|
proc main(): int =
|
||||||
let args = parseArgs()
|
let args = parseArgs()
|
||||||
|
echo args
|
||||||
|
|
||||||
if args.isNone:
|
if args.isNone:
|
||||||
echo "Usage: bwshell --command=cmd --profile=profile <sandbox_name>"
|
echo "Usage: bwshell --name=sandbox_name --profile=profile <sandbox_cmd>"
|
||||||
return 1
|
return 1
|
||||||
else:
|
else:
|
||||||
sandboxExec(args.unsafeGet)
|
sandboxExec(args.unsafeGet)
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
#!/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
|
Loading…
Reference in New Issue