Merge pull request #1383 from NextDom/develop

0.5.0-RC2
NextDom · Sep 30, 2019 · b1b1038 · b1b1038
2 parents 15e58ff + a7910b9
commit b1b1038
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/install/postinst b/install/postinst
@@ -18,8 +18,8 @@ options:
   -h            : display this message
   -i <host>     : database hostname, defaults to localhost
   -z <port>     : database port, defaults to 3306
-  -d <name>     : database name, detaults to nextdom (nextdomdev for dev version)
-  -u <username> : database user name, detaults to nextdom (nextdomdev for dev version)
+  -d <name>     : database name, defaults to nextdom (nextdomdev for dev version)
+  -u <username> : database user name, defaults to nextdom (nextdomdev for dev version)
   -p <password> : database user password, randomly generated if not given
   -r <password> : database root password
   -L <dir>      : set log directory, defaults to /var/log/nextdom

diff --git a/src/Repo/RepoApt.php b/src/Repo/RepoApt.php
@@ -59,31 +59,34 @@ public static function checkUpdate(&$targetUpdate)
                 }
             }
         } else if ($targetUpdate->getType() === 'core' && $targetUpdate->getLogicalId() === 'nextdom') {
-            exec(SystemHelper::getCmdSudo() . 'apt-get update');
-            exec(SystemHelper::getCmdSudo() . "apt-cache policy nextdom | grep Installed | sed 's/Installed: \\(.*\\)/\\1/g'", $currentVersion);
-            exec(SystemHelper::getCmdSudo() . "apt-cache policy nextdom | grep Candidate | sed 's/Candidate: \\(.*\\)/\\1/g'", $newVersion);
-            if (count($currentVersion) > 0 && count($newVersion) > 0) {
-                $currentVersion = trim($currentVersion[0]);
-                $newVersion = trim($newVersion[0]);
-                if (empty($targetUpdate->getLocalVersion()) || $targetUpdate->getLocalVersion() !== $currentVersion) {
-                    $targetUpdate->setLocalVersion($currentVersion);
-                    $targetUpdate->save();
+            exec(SystemHelper::getCmdSudo(). 'lsof /var/lib/dpkg/lock', $aptLocked);
+            if (count($aptLocked) === 0) {
+                exec(SystemHelper::getCmdSudo() . 'apt-get update');
+                exec(SystemHelper::getCmdSudo() . "apt-cache policy nextdom | grep Installed | sed 's/Installed: \\(.*\\)/\\1/g'", $currentVersion);
+                exec(SystemHelper::getCmdSudo() . "apt-cache policy nextdom | grep Candidate | sed 's/Candidate: \\(.*\\)/\\1/g'", $newVersion);
+                if (count($currentVersion) > 0 && count($newVersion) > 0) {
+                    $currentVersion = trim($currentVersion[0]);
+                    $newVersion = trim($newVersion[0]);
+                    if (empty($targetUpdate->getLocalVersion()) || $targetUpdate->getLocalVersion() !== $currentVersion) {
+                        $targetUpdate->setLocalVersion($currentVersion);
+                        $targetUpdate->save();
+                    }
+                    if ($currentVersion !== $newVersion && $currentVersion !== '(none)') {
+                        $targetUpdate->setRemoteVersion($newVersion);
+                        $targetUpdate->setStatus('update');
+                        $targetUpdate->save();
+                        $result = true;
+                    } elseif (empty($targetUpdate->getRemoteVersion())) {
+                        $targetUpdate->setRemoteVersion($newVersion);
+                        $targetUpdate->save();
+                    }
                 }
-                if ($currentVersion !== $newVersion && $currentVersion !== '(none)') {
-                    $targetUpdate->setRemoteVersion($newVersion);
-                    $targetUpdate->setStatus('update');
-                    $targetUpdate->save();
+                else {
+                    $targetUpdate->setSource('github');
+                    RepoGitHub::checkUpdate($targetUpdate);
                     $result = true;
-                } elseif (empty($targetUpdate->getRemoteVersion())) {
-                    $targetUpdate->setRemoteVersion($newVersion);
-                    $targetUpdate->save();
                 }
             }
-            else {
-                $targetUpdate->setSource('github');
-                RepoGitHub::checkUpdate($targetUpdate);
-                $result = true;
-            }
         }
         return $result;
     }