equal
deleted
inserted
replaced
1073 def is_session_dir(dir: Path): Boolean = |
1073 def is_session_dir(dir: Path): Boolean = |
1074 (dir + ROOT).is_file || (dir + ROOTS).is_file |
1074 (dir + ROOT).is_file || (dir + ROOTS).is_file |
1075 |
1075 |
1076 def check_session_dir(dir: Path): Path = |
1076 def check_session_dir(dir: Path): Path = |
1077 if (is_session_dir(dir)) File.pwd() + dir.expand |
1077 if (is_session_dir(dir)) File.pwd() + dir.expand |
1078 else error("Bad session root directory (missing ROOT or ROOTS): " + dir.expand.toString) |
1078 else { |
|
1079 error("Bad session root directory: " + dir.expand.toString + |
|
1080 "\n (missing \"ROOT\" or \"ROOTS\")") |
|
1081 } |
1079 |
1082 |
1080 def directories(dirs: List[Path], select_dirs: List[Path]): List[(Boolean, Path)] = { |
1083 def directories(dirs: List[Path], select_dirs: List[Path]): List[(Boolean, Path)] = { |
1081 val default_dirs = Components.directories().filter(is_session_dir) |
1084 val default_dirs = Components.directories().filter(is_session_dir) |
1082 for { (select, dir) <- (default_dirs ::: dirs).map((false, _)) ::: select_dirs.map((true, _)) } |
1085 for { (select, dir) <- (default_dirs ::: dirs).map((false, _)) ::: select_dirs.map((true, _)) } |
1083 yield (select, dir.canonical) |
1086 yield (select, dir.canonical) |