Skip to content

Commit 8b5588e

Browse files
author
MochiOS Team
committed
fix pid lock being created before sudo elevation
1 parent 86a3f1d commit 8b5588e

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

‎mochiinstall_wrapper‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
#!/usr/bin/env python3
22
import os, sys
33

4-
LOCK = "/tmp/mochiinstall.lock"
5-
if os.path.exists(LOCK):
6-
print("mochiinstall already running")
7-
sys.exit(0)
8-
9-
open(LOCK, "w").write(str(os.getpid()))
10-
114
sys.path.insert(0, '/usr/lib/mochiinstall')
125

136
args = list(sys.argv)
@@ -17,10 +10,17 @@ for flag in ('--nightly', '--tui'):
1710
if flag in args:
1811
args.remove(flag)
1912

13+
if os.geteuid() != 0:
14+
os.execvp("sudo", ["sudo", "-E", sys.executable] + sys.argv)
15+
16+
LOCK = "/tmp/mochiinstall.lock"
17+
if os.path.exists(LOCK):
18+
print("mochiinstall already running")
19+
sys.exit(0)
20+
21+
open(LOCK, "w").write(str(os.getpid()))
2022
try:
21-
if os.geteuid() != 0:
22-
os.execvp("sudo", ["sudo", "-E", sys.executable] + sys.argv)
23-
elif tui:
23+
if tui:
2424
from mochiinstall_app import main as tui_main
2525
tui_main()
2626
else:

0 commit comments

Comments
 (0)