Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix minor spelling mistakes #338

Merged
merged 1 commit into from
Aug 29, 2014
Merged

fix minor spelling mistakes #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ run() {
mainclass="$app_mainclass"
fi

# Now we check to see if there are any java opts on the environemnt. These get listed first, with the script able to override them.
# Now we check to see if there are any java opts on the environment. These get listed first, with the script able to override them.
if [[ "$JAVA_OPTS" != "" ]]; then
java_opts="${JAVA_OPTS}"
fi
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/typesafe/sbt/packager/windows/WindowsPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ trait WindowsPlugin extends Plugin {
if (f.getAbsolutePath != wix.getAbsolutePath) IO.copyFile(f, wix)
IO.copy(for ((f, to) <- m) yield (f, t / to))
// Now compile WIX
val wixdir = Option(System.getenv("WIX")) getOrElse sys.error("WIX environemnt not found. Please ensure WIX is installed on this computer.")
val wixdir = Option(System.getenv("WIX")) getOrElse sys.error("WIX environment not found. Please ensure WIX is installed on this computer.")
val candleCmd = Seq(wixdir + "\\bin\\candle.exe", wix.getAbsolutePath) ++ co
s.log.debug(candleCmd mkString " ")
Process(candleCmd, Some(t)) ! s.log match {
Expand Down