improve linux setup stuff

hooks/lando-autostart-engine.js

@@ -13,26 +13,8 @@ module.exports = async lando => {
         delay: 1000,
       },
       task: async (ctx, task) => {
-        // Prompt for sudo password on linux
-        if (lando.config.os.landoPlatform === 'linux' && lando.config.isInteractive) {
-          ctx.password = await task.prompt({
-            type: 'password',
-            name: 'password',
-            message: `Enter computer password for ${lando.config.username} to start docker`,
-            validate: async (input, state) => {
-              const options = {debug, ignoreReturnCode: true, password: input};
-              const response = await require('../utils/run-elevated')(['echo', 'hello there'], options);
-              if (response.code !== 0) return response.stderr;
-              return true;
-            },
-            onCancel() {
-              process.emit('SIGINT');
-            },
-          });
-        }
-
         try {
-          await lando.engine.daemon.up(false, ctx.password);
+          await lando.engine.daemon.up(false);
           await lando.shell.sh([`"${lando.engine.daemon.docker}"`, 'network', 'ls']);
         } catch (error) {
           ctx.errors.push(error);

hooks/lando-setup-build-engine-linux.js

@@ -43,7 +43,16 @@ module.exports = async (lando, options) => {
     hasRun: async () => {
       // start by looking at the engine install status
       // @NOTE: is this always defined?
-      return lando.engine.dockerInstalled;
+      if (lando.engine.dockerInstalled === false) return false;
+
+      // if we get here let's make sure the engine is on
+      try {
+        await lando.engine.daemon.up({max: 1, backoff: 1000});
+        return true;
+      } catch (error) {
+        lando.log.debug('docker install task has not run %j', error);
+        return false;
+      }
     },
     canRun: async () => {
       // throw if we cannot resolve a semantic version to a buildid

lib/art.js

@@ -300,7 +300,7 @@ exports.newContent = (type = 'guide') => [
   '',
 ].join(os.EOL);
 
-exports.setupHeader = (bengine = process.landoPlatform ?? process.platform === 'linux' ? 'Engine' : 'Desktop') => `
+exports.setupHeader = (bengine = process.landoPlatform === 'linux' || process.platform === 'linux' ? 'Engine' : 'Desktop') => `
 ${chalk.magenta(niceFont('Lando Setup!', 'Small Slant'))}
 
 ${chalk.bold('lando setup')} is a hidden convenience command to help you satisify the

lib/daemon.js

@@ -107,7 +107,8 @@ module.exports = class LandoDaemon {
                 break;
               case 'linux':
                 const lscript = path.join(this.scriptsDir, 'docker-engine-start.sh');
-                await require('../utils/run-elevated')([lscript], {debug, password});
+                if (password) await require('../utils/run-elevated')([lscript], {debug, password});
+                else await require('../utils/run-command')(lscript, {debug});
                 break;
               case 'win32':
               case 'wsl':

scripts/docker-engine-start.sh

@@ -1,4 +1,18 @@
 #!/bin/sh
 set -e
 
-systemctl start docker.service || service docker start
+# Function to check if a Polkit agent is running
+is_polkit_agent_running() {
+  ps aux | grep -q "[p]olkit" && return 0 || return 1
+}
+
+# Check if the DISPLAY or XDG_SESSION_TYPE indicates a desktop environment
+if [ -n "$DISPLAY" ] || [ "$XDG_SESSION_TYPE" = "x11" ] || [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+  if is_polkit_agent_running; then
+    systemctl start docker.service || service docker start
+  else
+    sudo systemctl start docker.service || sudo service docker start
+  fi
+else
+  sudo systemctl start docker.service || sudo service docker start
+fi

utils/shutdown-os.js

@@ -6,7 +6,7 @@ module.exports = ({
   message = 'Lando wants to restart your computer',
   password = undefined,
   type = 'restart',
-  wait = process.landoPlatform ?? process.platform === 'win32' ? 5 : 'now',
+  wait = process.landoPlatform === 'win32' || process.platform === 'win32' ? 5 : 'now',
   platform = process.landoPlatform ?? process.platform,
 } = {}) => {
   debug('shutdown with %o %o', type, {message, wait});