Skip to content

Commit

Permalink
Merge pull request #517 from myyk/master
Browse files Browse the repository at this point in the history
Fix typo 'scirpt' to be 'script'
  • Loading branch information
muuki88 committed Mar 7, 2015
2 parents d42e2e2 + 6908b16 commit 86d4611
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/sbt-test/debian/java-app-archetype/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ debianPackageRecommends in Debian += "git"
TaskKey[Unit]("check-script") <<= (stagingDirectory in Universal, name, streams) map { (dir, name, streams) =>
val script = dir / "bin" / name
System.out.synchronized {
System.err.println("---SCIRPT---")
System.err.println("---SCRIPT---")
val scriptContents = IO.read(script)
System.err.println(scriptContents)
System.err.println("---END SCIRPT---")
System.err.println("---END SCRIPT---")
for(file <- (dir.***).get)
System.err.println("\t"+file)
}
Expand Down
2 changes: 1 addition & 1 deletion src/sphinx/archetypes/cheatsheet.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ serverLoader is being used.

**Syntax**

You can use ``${{variable_name}}`` to reference variables when writing your scirpt. The default set of variables is:
You can use ``${{variable_name}}`` to reference variables when writing your script. The default set of variables is:

* ``descr`` - The description of the server.
* ``author`` - The configured author name.
Expand Down
2 changes: 1 addition & 1 deletion src/sphinx/archetypes/java_server/customize.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Create a file ``src/templates/start`` and it will be used instead.

**Syntax**

You can use ``${{variable_name}}`` to reference variables when writing your scirpt. The default set of variables is:
You can use ``${{variable_name}}`` to reference variables when writing your script. The default set of variables is:

* ``descr`` - The description of the server.
* ``author`` - The configured author name.
Expand Down
6 changes: 3 additions & 3 deletions test-project/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ TaskKey[Unit]("check-script") <<= (NativePackagerKeys.stagingDirectory in Univer
(dir, debTarget, name, version, author, streams) =>
val script = dir / "bin" / name
System.out.synchronized {
System.err.println("---SCIRPT---")
System.err.println("---SCRIPT---")
val scriptContents = IO.read(script)
System.err.println(scriptContents)
System.err.println("---END SCIRPT---")
System.err.println("---END SCRIPT---")
for(file <- (dir.***).get)
System.err.println("\t"+file)
}
Expand All @@ -54,4 +54,4 @@ TaskKey[Unit]("check-script") <<= (NativePackagerKeys.stagingDirectory in Univer
val prermOutput = Process("bash " + prerm.getAbsolutePath).!!
val prermExpected = "removing ${{name}}-${{version}} from ${{author}}"
assert(prermOutput contains prermExpected, s"Failed to correctly run the prerm script!. Found [${prermOutput}] wanted [${prermExpected}]")
}
}

0 comments on commit 86d4611

Please sign in to comment.