Start working on launcher mode
This commit is contained in:
parent
0103df5ca9
commit
67ea99cd38
16
lib/args.nim
16
lib/args.nim
|
@ -4,11 +4,11 @@ import os
|
|||
|
||||
type Args* = object
|
||||
name*: Option[string]
|
||||
cmd*: Option[string]
|
||||
cmd*: Option[seq[string]]
|
||||
profile*: Option[string]
|
||||
|
||||
proc getCmd*(args: Args): string =
|
||||
return args.cmd.get(getEnv("SHELL", "/bin/bash"))
|
||||
proc getCmd*(args: Args): seq[string] =
|
||||
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 "command", "c":
|
||||
args.cmd = some(value)
|
||||
of "name", "n":
|
||||
args.name = some(value)
|
||||
of "profile", "p":
|
||||
args.profile = some(value)
|
||||
else:
|
||||
|
@ -30,6 +30,7 @@ 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()
|
||||
|
@ -40,6 +41,9 @@ proc parseArgs*(): Option[Args] =
|
|||
echo "Invalid argument ", p.val
|
||||
return
|
||||
of cmdArgument:
|
||||
args.name = some(p.key.string)
|
||||
command.add(p.key.string)
|
||||
|
||||
if command.len > 0:
|
||||
args.cmd = some(command)
|
||||
|
||||
return some(args)
|
|
@ -10,7 +10,7 @@ proc sandboxExec*(args: Args) =
|
|||
var call = BwrapCall()
|
||||
var configPath = none(string)
|
||||
|
||||
let hostname = args.name.get(getProfile(argst ))
|
||||
let hostname = args.name.get(getProfile(args))
|
||||
|
||||
if args.name.isSome:
|
||||
let name = args.name.unsafeGet
|
||||
|
@ -18,7 +18,6 @@ proc sandboxExec*(args: Args) =
|
|||
let sandboxFiles = sandboxPath.joinPath("files")
|
||||
let userConfig = sandboxPath.joinPath("config.json")
|
||||
|
||||
|
||||
createDir(sandboxFiles)
|
||||
call.addArg("--bind", sandboxFiles, getHomeDir())
|
||||
|
||||
|
|
3
main.nim
3
main.nim
|
@ -4,9 +4,10 @@ import options
|
|||
|
||||
proc main(): int =
|
||||
let args = parseArgs()
|
||||
echo args
|
||||
|
||||
if args.isNone:
|
||||
echo "Usage: bwshell --command=cmd --profile=profile <sandbox_name>"
|
||||
echo "Usage: bwshell --name=sandbox_name --profile=profile <sandbox_cmd>"
|
||||
return 1
|
||||
else:
|
||||
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