fix errors when windows env vars dont exist

learn-co · Dec 7, 2016 · 4ff60fb · 4ff60fb
1 parent 0d0a140
commit 4ff60fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/windows.coffee b/lib/windows.coffee
@@ -9,14 +9,14 @@
   isWindows = process.platform == 'win32'
   return if !isWindows
 
-  installLocationX86 = path.join(process.env['ProgramFiles(x86)'], 'Learn IDE')
-  installLocation = path.join(process.env['ProgramFiles'], 'Learn IDE')
+  installLocationX86 = path.join((process.env['ProgramFiles(x86)'] || ''), 'Learn IDE')
+  installLocation = path.join((process.env['ProgramFiles'] || ''), 'Learn IDE')
 
   if (fs.existsSync(installLocationX86) || fs.existsSync(installLocation))
     alert("You appear to have two versions of the Learn IDE installed. This happens when upgrading from v1.9 to v2 on Windows. Please uninstall v1.9 by following the instructions in the help article that opens when you close this alert.")
     shell.openExternal('https://theflatironschool.zendesk.com/hc/en-us/articles/235711268')
 
-    v1InitFile = path.join(atom.getConfigDirPath(), 'ide-init.coffee')
+    v1InitFile = path.join((atom.getConfigDirPath() || ''), 'ide-init.coffee')
     if fs.existsSync(v1InitFile)
       contents = fs.readFileSync(v1InitFile, 'utf8')
       return if contents.indexOf(id) > -1

diff --git a/lib/windows_code.txt b/lib/windows_code.txt
@@ -9,14 +9,14 @@
   isWindows = process.platform == 'win32'
   return if !isWindows
 
-  installLocationX86 = path.join(process.env['ProgramFiles(x86)'], 'Learn IDE')
-  installLocation = path.join(process.env['ProgramFiles'], 'Learn IDE')
+  installLocationX86 = path.join((process.env['ProgramFiles(x86)'] || ''), 'Learn IDE')
+  installLocation = path.join((process.env['ProgramFiles'] || ''), 'Learn IDE')
 
   if (fs.existsSync(installLocationX86) || fs.existsSync(installLocation))
     alert("You appear to have two versions of the Learn IDE installed. This happens when upgrading from v1.9 to v2 on Windows. Please uninstall v1.9 by following the instructions in the help article that opens when you close this alert.")
     shell.openExternal('https://theflatironschool.zendesk.com/hc/en-us/articles/235711268')
 
-    v1InitFile = path.join(atom.getConfigDirPath(), 'ide-init.coffee')
+    v1InitFile = path.join((atom.getConfigDirPath() || ''), 'ide-init.coffee')
     if fs.existsSync(v1InitFile)
       contents = fs.readFileSync(v1InitFile, 'utf8')
       return if contents.indexOf(id) > -1