Skip to content

Commit a1a5fc7

Browse files
authored
Merge pull request #6624 from m-renaud/m-renaud-default-installdir
Use default install directory if not specified.
2 parents b24a488 + 735467e commit a1a5fc7

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cabal-install/Distribution/Client/CmdInstall.hs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import Distribution.Simple.BuildPaths
6464
import Distribution.Simple.Program.Find
6565
( ProgramSearchPathEntry(..) )
6666
import Distribution.Client.Config
67-
( getCabalDir, loadConfig, SavedConfig(..) )
67+
( defaultInstallPath, getCabalDir, loadConfig, SavedConfig(..) )
6868
import qualified Distribution.Simple.PackageIndex as PI
6969
import Distribution.Solver.Types.PackageIndex
7070
( lookupPackageName, searchByName )
@@ -641,6 +641,7 @@ installExes
641641
-> IO ()
642642
installExes verbosity baseCtx buildCtx platform compiler
643643
configFlags clientInstallFlags = do
644+
installPath <- defaultInstallPath
644645
let storeDirLayout = cabalStoreDirLayout $ cabalDirLayout baseCtx
645646

646647
prefix = fromFlagOrDefault "" (fmap InstallDirs.fromPathTemplate (configProgPrefix configFlags))
@@ -658,9 +659,10 @@ installExes verbosity baseCtx buildCtx platform compiler
658659
mkFinalExeName exe = prefix <> unUnqualComponentName exe <> suffix <.> exeExtension platform
659660
installdirUnknown =
660661
"installdir is not defined. Set it in your cabal config file "
661-
++ "or use --installdir=<path>"
662+
++ "or use --installdir=<path>. Using default installdir: " ++ show installPath
662663

663-
installdir <- fromFlagOrDefault (die' verbosity installdirUnknown) $
664+
installdir <- fromFlagOrDefault
665+
(warn verbosity installdirUnknown >> pure installPath) $
664666
pure <$> cinstInstalldir clientInstallFlags
665667
createDirectoryIfMissingVerbose verbosity False installdir
666668
warnIfNoExes verbosity buildCtx

cabal-install/Distribution/Client/Config.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module Distribution.Client.Config (
2626
defaultConfigFile,
2727
defaultCacheDir,
2828
defaultCompiler,
29+
defaultInstallPath,
2930
defaultLogsDir,
3031
defaultUserInstall,
3132

0 commit comments

Comments
 (0)