fix: improve error handling

nokome · nokome · commit 1965461dba97 · 2019-01-31T17:14:09.000+13:00
diff --git a/src/Environment.ts b/src/Environment.ts
@@ -172,10 +172,11 @@ export default class Environment {
     const envs = []
     for (let name of names) {
       const env = new Environment(name)
+      const built = await env.built()
       envs.push(Object.assign({}, env, {
         path: env.path(),
-        built: await env.built(),
-        location: await nix.location(name)
+        built: built,
+        location: built ? await nix.location(name) : '-'
       }))
     }
     return envs
@@ -456,10 +457,17 @@ export default class Environment {
       // During development you'll need to use ---pure=false so that
       // node is available to run Nixster. In production, when a user
       // has installed a binary, this shouldn't be necessary
-      let nixsterPath = await spawn('which', ['nixster'])
-      const tempRcFile = tmp.fileSync()
-      fs.writeFileSync(tempRcFile.name, `alias nixster="${nixsterPath.toString().trim()}"\n`)
-      shellArgs.push('--rcfile', tempRcFile.name)
+      let nixsterPath
+      try {
+        nixsterPath = await spawn('which', ['nixster'])
+      } catch (error) {
+        // Nixster not on path
+      }
+      if (nixsterPath) {
+        const tempRcFile = tmp.fileSync()
+        fs.writeFileSync(tempRcFile.name, `alias nixster="${nixsterPath.toString().trim()}"\n`)
+        shellArgs.push('--rcfile', tempRcFile.name)
+      }
     }
 
     // Environment variables
diff --git a/src/nix.ts b/src/nix.ts
@@ -250,7 +250,7 @@ export async function location (env: string): Promise<string> {
   const profile = path.join(profiles, env)
   if (!fs.existsSync(profile)) throw new Error(`Profile for environment "${env}" not exist at "${profile}"`)
   const location = await spawn('readlink', ['-f', profile])
-  if (location.length === 0) throw new Error(`Could not resolve location of environment "${env}" from the profile "${profile}"`)
+  if (location.trim().length === 0) throw new Error(`Could not resolve location of environment "${env}" from the profile "${profile}"`)
   return location
 }
 

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ export async function location (env: string): Promise<string> {`
`250`	`250`	`const profile = path.join(profiles, env)`
`251`	`251`	if (!fs.existsSync(profile)) throw new Error(`Profile for environment "${env}" not exist at "${profile}"`)
`252`	`252`	`const location = await spawn('readlink', ['-f', profile])`
`253`		- if (location.length === 0) throw new Error(`Could not resolve location of environment "${env}" from the profile "${profile}"`)
	`253`	+ if (location.trim().length === 0) throw new Error(`Could not resolve location of environment "${env}" from the profile "${profile}"`)
`254`	`254`	`return location`
`255`	`255`	`}`
`256`	`256`