fix(setup/linux): some issues with the Linux setup script (#190)

* Set the correct target platform alias * system.which returns null when no binary is found * If sudo returns an error about the password, try askpass * Add a check for undefined Co-authored-by: Nick Hehr <[email protected]> --------- Co-authored-by: Nick Hehr <[email protected]>
HipsterBrown · Nov 27, 2024 · e5ef6eb · e5ef6eb
1 parent 896ebd0
commit e5ef6eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/toolbox/prompt/devices.ts b/src/toolbox/prompt/devices.ts
@@ -6,8 +6,8 @@ export const DEVICE_ALIAS: Record<Device | 'esp8266', Device> = Object.freeze({
   mac: 'mac',
   windows_nt: 'win',
   win: 'win',
-  linux: 'lin',
-  lin: 'lin',
+  linux: 'linux',
+  lin: 'linux',
   esp: 'esp',
   esp32: 'esp32',
   wasm: 'wasm',

diff --git a/src/toolbox/system/exec.ts b/src/toolbox/system/exec.ts
@@ -5,7 +5,7 @@ import type { Device } from '../../types'
 
 function ensureAskPass(): void {
   const SUDO_ASKPASS = system.which('ssh-askpass')
-  if (SUDO_ASKPASS === undefined) {
+  if (SUDO_ASKPASS === null || SUDO_ASKPASS === undefined) {
     print.warning('ssh-askpass required to prompt for password')
     process.exit(1)
   }
@@ -27,7 +27,7 @@ export async function execWithSudo(
     )
     return
   } catch (error) {
-    if (error.toString().includes('password') === false) {
+    if (error.toString().includes('password') === true) {
       ensureAskPass()
     } else {
       throw error as Error