Skip to content

Commit

Permalink
[skip ci] kpkg: fix packaging part using sandbox user instead of fake…
Browse files Browse the repository at this point in the history 
…root
  • Loading branch information
@kreatoo
kreatoo committed Aug 16, 2023
1 parent 1a5a562 commit 6bb06f9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kpkg/commands/buildcmd.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,15 @@ proc builder*(package: string, destdir: string,
if existsPrepare == 0:
cmd = execShellCmd(sboxWrap(cmdStr))
cmd2 = execShellCmd(sboxWrap(
". "&path&"/run && export DESTDIR="&root&" && export ROOT=$DESTDIR && fakeroot -- "&cmd2Str))
". "&path&"/run && export DESTDIR="&root&" && export ROOT=$DESTDIR && fakeroot -- /bin/sh -c \""&cmd2Str&"\""))
else:
cmd = execShellCmd(sboxWrap("cd "&folder[0]&" && "&cmdStr))
cmd2 = execShellCmd(sboxWrap(
". "&path&"/run && export DESTDIR="&root&" && cd "&folder[
0]&" && export ROOT=$DESTDIR && fakeroot -- "&cmd2Str))
0]&" && export ROOT=$DESTDIR && fakeroot -- /bin/sh -c \""&cmd2Str&"\""))
else:
cmd = execShellCmd(sboxWrap(cmdStr))
cmd2 = execShellCmd(sboxWrap(". "&path&"/run && export DESTDIR="&root&" && export ROOT=$DESTDIR && fakeroot -- "&cmd2Str))
cmd2 = execShellCmd(sboxWrap(". "&path&"/run && export DESTDIR="&root&" && export ROOT=$DESTDIR && fakeroot -- /bin/sh -c \""&cmd2Str&"\""))

if cmd != 0:
err("build failed")
Expand Down

0 comments on commit 6bb06f9

Please sign in to comment.