Correct stack local install path and use a more precise name for the ugly hack

Author: jneira

install/src/Cabal.hs

@@ -24,7 +24,7 @@ execCabal_ :: [String] -> Action ()
 execCabal_ = execCabalWithOriginalPath
 
 execCabalWithOriginalPath :: CmdResult r => [String] -> Action r
-execCabalWithOriginalPath = withOriginalPath . (command [] "cabal")
+execCabalWithOriginalPath = withoutStackCachedBinaries . (command [] "cabal")
 
 cabalBuildData :: Action ()
 cabalBuildData = do
@@ -77,7 +77,7 @@ cabalInstallHie versionNumber = do
 installCabalWithStack :: Action ()
 installCabalWithStack = do
   -- try to find existing `cabal` executable with appropriate version
-  mbc <- withOriginalPath (liftIO (findExecutable "cabal"))
+  mbc <- withoutStackCachedBinaries (liftIO (findExecutable "cabal"))
 
   case mbc of
     Just c  -> do

install/src/Stack.hs

@@ -99,16 +99,16 @@ stackBuildFailMsg =
     ++ "If this does not work, open an issue at \n"
     ++ "\thttps://github.com/haskell/haskell-ide-engine"
 
--- | Run actions with the original user path, without stack additions
-withOriginalPath :: Action a -> Action a
-withOriginalPath action = do
+-- |Run actions without the stack cached binaries 
+withoutStackCachedBinaries :: Action a -> Action a
+withoutStackCachedBinaries action = do
   mbPath <- liftIO (lookupEnv "PATH")
 
   case (mbPath, isRunFromStack) of
 
     (Just paths, True) -> do
       snapshotDir <- trimmedStdout <$> execStackShake ["path", "--snapshot-install-root"]
-      localInstallDir <- trimmedStdout <$> execStackShake ["path", "--local-install-dir"]
+      localInstallDir <- trimmedStdout <$> execStackShake ["path", "--local-install-root"]
 
       let cacheBinPaths = [snapshotDir </> "bin", localInstallDir </> "bin"]
       let origPaths = removePathsContaining cacheBinPaths paths