File tree 2 files changed +10
-13
lines changed
compiler/src/dotty/tools/dotc/classpath
2 files changed +10
-13
lines changed Original file line number Diff line number Diff line change @@ -69,8 +69,10 @@ class ClassPathFactory {
69
69
a <- ClassPath .expandManifestPath(file.absolutePath)
70
70
path = java.nio.file.Paths .get(a.toURI()).nn
71
71
if Files .exists(path)
72
+ entry = AbstractFile .getFile(path)
73
+ if Option (entry).nonEmpty
72
74
yield
73
- newClassPath(AbstractFile .getFile(path) )
75
+ newClassPath(entry )
74
76
else
75
77
Seq .empty
76
78
Original file line number Diff line number Diff line change 6
6
# * Credits: This script is based on the script generated by sbt-pack.
7
7
# *--------------------------------------------------------------------------*/
8
8
9
- if [ -e /usr/bin/tty -a " ` tty` " != " not a tty" -a ! -p /dev/stdin ]; then
10
- isterminal=1
11
- # save terminal settings
12
- saved_stty=$( stty -g 2> /dev/null)
13
- # clear on error so we don't later try to restore them
14
- if [[ ! $? ]]; then
15
- saved_stty=" "
16
- fi
17
- else
18
- isterminal=0
9
+ # save terminal settings
10
+ saved_stty=$( stty -g 2> /dev/null)
11
+ # clear on error so we don't later try to restore them
12
+ if [[ ! $? ]]; then
13
+ saved_stty=" "
19
14
fi
20
15
21
16
# restore stty settings (echo in particular)
22
17
function restoreSttySettings() {
23
- [ $isterminal -eq 1 ] && stty $saved_stty
18
+ stty $saved_stty
24
19
saved_stty=" "
25
20
}
26
21
@@ -66,7 +61,7 @@ if [[ ${cygwin-} || ${mingw-} || ${msys-} ]]; then
66
61
CYGPATHCMD=` which cygpath 2> /dev/null`
67
62
case " $TERM " in
68
63
rxvt* | xterm* | cygwin* )
69
- [ $isterminal -eq 1 ] && stty -icanon min 1 -echo
64
+ stty -icanon min 1 -echo
70
65
JAVA_OPTS=" $JAVA_OPTS -Djline.terminal=unix"
71
66
;;
72
67
esac
You can’t perform that action at this time.
0 commit comments