Skip to content

Commit e391d23

Browse files
committed
remove defensive assignments in dist/bin/scalac
1 parent 57aeef4 commit e391d23

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

dist/bin/scalac

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ classpathArgs () {
6060
# echo "sbt-intface: $SBT_INTF"
6161

6262
toolchain=""
63-
[ -n "${SCALA_LIB-}" ] && toolchain+="$SCALA_LIB$PSEP"
64-
[ -n "${DOTTY_LIB-}" ] && toolchain+="$DOTTY_LIB$PSEP"
65-
[ -n "${SCALA_ASM-}" ] && toolchain+="$SCALA_ASM$PSEP"
66-
[ -n "${SBT_INTF-}" ] && toolchain+="$SBT_INTF$PSEP"
67-
[ -n "${DOTTY_INTF-}" ] && toolchain+="$DOTTY_INTF$PSEP"
68-
[ -n "${DOTTY_COMP-}" ] && toolchain+="$DOTTY_COMP$PSEP"
69-
[ -n "${TASTY_CORE-}" ] && toolchain+="$TASTY_CORE$PSEP"
70-
[ -n "${DOTTY_STAGING-}" ] && toolchain+="$DOTTY_STAGING$PSEP"
71-
[ -n "${DOTTY_TASTY_INSPECTOR-}" ] && toolchain+="$DOTTY_TASTY_INSPECTOR$PSEP"
63+
toolchain+="$SCALA_LIB$PSEP"
64+
toolchain+="$DOTTY_LIB$PSEP"
65+
toolchain+="$SCALA_ASM$PSEP"
66+
toolchain+="$SBT_INTF$PSEP"
67+
toolchain+="$DOTTY_INTF$PSEP"
68+
toolchain+="$DOTTY_COMP$PSEP"
69+
toolchain+="$TASTY_CORE$PSEP"
70+
toolchain+="$DOTTY_STAGING$PSEP"
71+
toolchain+="$DOTTY_TASTY_INSPECTOR$PSEP"
7272

7373
# jine
74-
[ -n "${JLINE_READER-}" ] && toolchain+="$JLINE_READER$PSEP"
75-
[ -n "${JLINE_TERMINAL-}" ] && toolchain+="$JLINE_TERMINAL$PSEP"
76-
[ -n "${JLINE_TERMINAL_JNA-}" ] && toolchain+="$JLINE_TERMINAL_JNA$PSEP"
77-
[ -n "${JNA-}" ] && toolchain+="$JNA$PSEP"
74+
toolchain+="$JLINE_READER$PSEP"
75+
toolchain+="$JLINE_TERMINAL$PSEP"
76+
toolchain+="$JLINE_TERMINAL_JNA$PSEP"
77+
toolchain+="$JNA$PSEP"
7878

7979
jvm_cp_args="-classpath \"$toolchain\""
8080
}

0 commit comments

Comments
 (0)