cpm and currycheck updated

cpm/src/CPM/FileUtil.curry

@@ -33,7 +33,9 @@ import List      ( intercalate, splitOn )
 
 --- Joins a list of directories into a search path.
 joinSearchPath :: [FilePath] -> String
-joinSearchPath dirs = intercalate [searchPathSeparator] dirs
+joinSearchPath = intercalate [searchPathSeparator] . map emptyPath2Dot
+ where
+  emptyPath2Dot p = if null p then "." else p
 
 --- Recursively copies a directory structure.
 copyDirectory :: String -> String -> IO ()

currycheck/src/CurryCheck.curry

@@ -928,7 +928,9 @@ main = do
                           "Generating main test module '"++testmodname++"'..."
     genMainTestModule opts testmodname finaltestmodules
     putStrIfNormal opts $ withColor opts blue $ "and compiling it...\n"
-    currypath <- getEnviron "CURRYPATH"
+    ecurrypath <- getEnviron "CURRYPATH"
+    let currypath = case ecurrypath of ':':_ -> '.':ecurrypath
+                                       _     -> ecurrypath
     let runcmd = unwords $
                    [ installDir </> "bin" </> "curry"
                    , "--noreadline"

currypp/.cpm/packages/currycheck/src/CurryCheck.curry

@@ -928,7 +928,9 @@ main = do
                           "Generating main test module '"++testmodname++"'..."
     genMainTestModule opts testmodname finaltestmodules
     putStrIfNormal opts $ withColor opts blue $ "and compiling it...\n"
-    currypath <- getEnviron "CURRYPATH"
+    ecurrypath <- getEnviron "CURRYPATH"
+    let currypath = case ecurrypath of ':':_ -> '.':ecurrypath
+                                       _     -> ecurrypath
     let runcmd = unwords $
                    [ installDir </> "bin" </> "curry"
                    , "--noreadline"