Skip to content

Commit d71b59c

Browse files
committed
[worker.php] Fix chown for chromium .config dir
1 parent a4d688c commit d71b59c

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

www/daemon/worker.php

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,8 +1257,21 @@
12571257
sysCmd('systemctl daemon-reload');
12581258

12591259
// Start local display
1260+
$cfgDir = $_SESSION['home_dir'] . '/.config';
1261+
if (file_exists($cfgDir)) {
1262+
$chownUser = $_SESSION['user_id'] . ':' . $_SESSION['user_id'];
1263+
$result = sysCmd('stat -c %G":"%U ' . $cfgDir . ' | grep "' . $chownUser .'"');
1264+
if (empty($result)) {
1265+
sysCmd('chown ' . $chownUser . ' ' . $cfgDir);
1266+
$cfgStatus = 'ownership changed to ' . $chownUser;
1267+
} else {
1268+
$cfgStatus = 'directory ok';
1269+
}
1270+
} else {
1271+
$cfgStatus = 'WARNING: directory ' . $cfgDir . ' does not exist';
1272+
}
12601273
if ($_SESSION['local_display'] == '1') {
1261-
$cfgStatus = startLocalDisplay();
1274+
startLocalDisplay();
12621275
}
12631276
workerLog('worker: Local display: ' . ($_SESSION['local_display'] == '1' ? 'on' : 'off'));
12641277
workerLog('worker: Chromium ver: ' . sysCmd("dpkg -l | grep -m 1 \"chromium-browser\" | awk '{print $3}' | cut -d\":\" -f 2")[0]);
@@ -2368,21 +2381,7 @@ function startGpioBtnHandler() {
23682381

23692382
// Local display
23702383
function startLocalDisplay() {
2371-
$cfgDir = $_SESSION['home_dir'] . '/.config';
2372-
if (file_exists($cfgDir)) {
2373-
$chownUser = $_SESSION['user_id'] . ':' . $_SESSION['user_id'];
2374-
$result = sysCmd('stat ' . $cfgDir . ' | grep "' . $_SESSION['user_id'] .'"');
2375-
if (empty($result)) {
2376-
sysCmd('chown ' . $chownUser . ' ' . $cfgDir);
2377-
$cfgStatus = 'ownership changed to ' . $chownUser;
2378-
} else {
2379-
$cfgStatus = 'directory ok';
2380-
}
2381-
} else {
2382-
$cfgStatus = 'WARNING: directory ' . $cfgDir . ' does not exist';
2383-
}
23842384
sysCmd('systemctl start localdisplay');
2385-
return $cfgStatus;
23862385
}
23872386
function stopLocalDisplay() {
23882387
sysCmd('systemctl stop localdisplay');

0 commit comments

Comments
 (0)