Update argparser to work with launcher mode
This commit is contained in:
parent
9cad6fc050
commit
9a3e36fcb1
40
lib/args.nim
40
lib/args.nim
|
@ -1,4 +1,3 @@
|
||||||
import parseopt
|
|
||||||
import options
|
import options
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
@ -16,32 +15,25 @@ proc getProfile*(args: Args): string =
|
||||||
|
|
||||||
return "default"
|
return "default"
|
||||||
|
|
||||||
proc parseOpt(args: var Args, key: string, value: string): bool =
|
|
||||||
case key
|
|
||||||
of "name", "n":
|
|
||||||
args.name = some(value)
|
|
||||||
of "profile", "p":
|
|
||||||
args.profile = some(value)
|
|
||||||
else:
|
|
||||||
return false
|
|
||||||
|
|
||||||
return true
|
|
||||||
|
|
||||||
proc parseArgs*(): Option[Args] =
|
proc parseArgs*(): Option[Args] =
|
||||||
var p = initOptParser()
|
|
||||||
var args = Args()
|
var args = Args()
|
||||||
var command = newSeq[string]()
|
|
||||||
|
|
||||||
while true:
|
var command = newSeq[string]()
|
||||||
p.next()
|
var i = 1
|
||||||
case p.kind
|
|
||||||
of cmdEnd: break
|
while i <= paramCount():
|
||||||
of cmdShortOption, cmdLongOption:
|
var arg = paramStr(i)
|
||||||
if p.val == "" or args.parseOpt(p.key, p.val) == false:
|
|
||||||
echo "Invalid argument ", p.val
|
if arg == "--name":
|
||||||
return
|
args.name = some(paramStr(i + 1))
|
||||||
of cmdArgument:
|
i += 2
|
||||||
command.add(p.key.string)
|
elif arg == "--profile":
|
||||||
|
args.profile = some(paramStr(i + 1))
|
||||||
|
i += 2
|
||||||
|
else:
|
||||||
|
echo arg
|
||||||
|
command.add(arg)
|
||||||
|
i += 1
|
||||||
|
|
||||||
if command.len > 0:
|
if command.len > 0:
|
||||||
args.cmd = some(command)
|
args.cmd = some(command)
|
||||||
|
|
|
@ -12,13 +12,15 @@ check_dir() {
|
||||||
for application in "$dir/"*; do
|
for application in "$dir/"*; do
|
||||||
file="$(basename "$application")"
|
file="$(basename "$application")"
|
||||||
|
|
||||||
sed "s/Exec=/Exec=bwrap --name='$file' --profile=gui /gi" "$application" > "$target/$file"
|
sed "s/Exec=/Exec=bwshell --name '$file' --profile gui /gi" "$application" > "$target/$file"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
dirs=("/usr/share/applications" "$HOME/.local/share/applications")
|
dirs=("/usr/share/applications" "$HOME/.local/share/applications")
|
||||||
target="$1"
|
target="$1"
|
||||||
|
|
||||||
|
mkdir -p "$target"
|
||||||
|
|
||||||
for dir in "${dirs[@]}"; do
|
for dir in "${dirs[@]}"; do
|
||||||
check_dir "$dir"
|
check_dir "$dir"
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue