Commit Graph

437 Commits

Author SHA1 Message Date
eugene yokota 4188199965
Merge pull request #200 from sbt/bat-no-quotes
Drop quotes in bat script
2017-12-13 18:56:52 -05:00
Dale Wijnand 6dbf7eb527
Drop quotes in bat script 2017-12-13 23:22:39 +00:00
Dale Wijnand 7d70f0966c
Merge pull request #199 from thatfulvioguy/use-expr-over-bc
Use expr instead of bc when checking Java versions.
2017-11-16 16:21:28 +00:00
Fulvio Valente 6ad16c2b74 Use expr instead of bc when checking Java versions.
Because expr is in coreutils, we can expect it to be present on systems unlike bc.

Fixes #198
Fixes #192
2017-11-16 15:11:19 +00:00
Dale Wijnand efdc7c90ca
Merge pull request #197 from mkurz/debugFix
Ignore debug output when getting runtime jar path
2017-11-16 11:09:17 +00:00
Dale Wijnand 096a0d83b2
Update sbt.build.version in CONTRIBUTING too. 2017-11-16 11:02:18 +00:00
Dale Wijnand 749a1b7f27
Merge pull request #196 from javabrett/add-travis-build-image
Updated README.md to add a Travis build status image, fixed Travis build
2017-11-16 11:01:46 +00:00
Brett Randall 8f276e95e0 Set compatible build properties, sbt version (1.0.3) to fix Travis build. Added required fakeroot package.
Fixed #180.
2017-11-15 11:38:53 -05:00
Matthias Kurz 006a5eee23
Ignore debug output when getting runtime jar path 2017-11-15 11:55:12 +01:00
Dale Wijnand 320d993fa6
Merge pull request #195 from javabrett/refer-jdk-not-jre
Changed references to downloading/installing/updating Java (JRE?) to …
2017-11-13 11:50:02 +00:00
Brett Randall 602b138771
Updated README.md to add a Travis build status image 2017-11-12 16:15:58 -08:00
Brett Randall da02335261 Changed references to downloading/installing/updating Java (JRE?) to refer to JDK.
Updated download URLs. Fixed #115.
2017-11-10 19:48:05 +00:00
Dale Wijnand 30a5038b71
Merge pull request #191 from twm/bd-dep
Add bc dependency in Debian/Ubuntu package
2017-10-30 16:51:08 +00:00
Tom Most eb69920e81 Add bc dependency in Debian/Ubuntu package 2017-10-27 19:49:11 -07:00
eugene yokota c7fc2c9247 Merge pull request #189 from stringbean/java9-gc
Set -XX:+UseParallelGC on Java 9
2017-09-28 19:20:21 -04:00
Michael Stringer 97f38b5a1d
Set -XX:+UseParallelGC on Java 9 2017-09-28 20:00:33 +01:00
eugene yokota 470da7bd9e Merge pull request #182 from smarter/java10
Support Java 10
2017-09-26 18:32:55 -04:00
eugene yokota bc00a5490c Merge pull request #187 from timcharper/patch-1
OS X compatible line-ending stripping
2017-09-26 18:32:22 -04:00
Tim Harper d251388f53 OS X compatible line-ending stripping
BSD sed interprets sed 's/\r//' as "replace the literal letter r". A more compatible approach delegates the interpretation of this sequence to bash.

Fixes #186
2017-09-26 15:30:03 -06:00
Dale Wijnand c0b961c5c3 Merge pull request #183 from SethTisue/upgrade-bintray-plugin
use newer version of bintray plugin
2017-09-25 11:34:27 +01:00
Seth Tisue 66a105eb03 use newer version of bintray plugin
for Scala community build friendliness.  but also just
generally a good thing
2017-09-24 19:45:18 -07:00
Guillaume Martres 32e8859df6 Support Java 10
In bash, "10" < "1.6" returns false, because it's a string comparison.
Use bc instead to compare decimal numbers.
2017-09-19 13:33:07 +02:00
eugene yokota e310735202 Merge pull request #166 from steinybot/wip/sbtopts-crlf
Remove carriage return characters when loading configuration files.
2017-09-18 12:55:58 -04:00
eugene yokota 206ccb675a Merge branch 'master' into wip/sbtopts-crlf 2017-09-18 12:55:40 -04:00
Eugene Yokota 9eeb402a15 Reset build number to 0 2017-08-29 17:34:24 -04:00
eugene yokota 3696f8aad4 Merge pull request #179 from yurique/etc-sbtopts
Use /etc/sbt/sbtopts file if exists.
2017-08-25 23:30:56 -04:00
Iurii Malchenko 3d194ebdbe Use /etc/sbt/sbtopts file if exists. 2017-08-26 02:23:26 +03:00
eugene yokota 1be80c06ee Merge pull request #177 from sbt/wip/about
Don't run sbt about as post install
2017-08-16 01:23:45 -04:00
Eugene Yokota 70aceedad7 Don't run sbt about as post install.
Fixes sbt/sbt#3448
Fixes #176
2017-08-16 01:22:22 -04:00
Eugene Yokota ec086a891a changelog 2017-08-10 22:33:19 -04:00
eugene yokota 597060b08b Fix for building on Windows 2017-08-10 05:26:03 -04:00
eugene yokota c2612578b7 Merge pull request #175 from sbt/wip/fix_robocopy
Fix variable substitution
2017-08-10 04:53:14 -04:00
Eugene Yokota d6d79bba6c Fix variable substitution
Fixes #173
2017-08-10 04:42:57 -04:00
Eugene Yokota 38e4fa9b7b 0.13.16 build id 2017-07-26 18:00:14 -04:00
Dale Wijnand cc69023585 Merge pull request #172 from retronym/ticket/170-java-version-sed
Fix java version detection in bash script
2017-07-26 09:06:33 +01:00
Jason Zaugg c487e3166e Fix java version detection in bash script
`java -version` can include an extra line of output
if `_JAVA_OPTTIONS` is set.

This commit adds a grep step before sed to harden
against this possibility.

Before:
```
 (export _JAVA_OPTIONS=-Dfoo.bar; java -version 2>&1 | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
Picked up _JAVA_OPTIONS: -Dfoo.bar
```

After:
```
 (export _JAVA_OPTIONS=-Dfoo.bar; java -version 2>&1 | grep ' version "' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
1.8
```
2017-07-26 14:57:58 +10:00
Dale Wijnand 80e8abc22d Merge pull request #169 from dragos/patch-1
Read last line of config files without EOL
2017-07-24 15:29:34 +01:00
Iulian Dragos a616031ca3 Read last line of config files without EOL
The last line in a configuration file may not have a terminating EOL character. This commit fixes the launcher script to read that line as well.

Inspiration: https://stackoverflow.com/questions/10929453/read-a-file-line-by-line-assigning-the-value-to-a-variable
2017-06-30 16:31:28 +02:00
Jason Steenstra-Pickens 11edc53335 Remove carriage return characters when loading configuration files.
Issue: sbt/sbt-launcher-package#165
2017-06-01 22:46:06 +12:00
eugene yokota ace1846e36 Merge pull request #160 from tksk/master
Fix syncing preloaded bugs
2017-05-30 13:07:27 -04:00
Eugene Yokota 080bd0d92f package signer 2017-05-11 00:11:11 -04:00
Eugene Yokota 95f970634a Post installation script to run sbt about 2017-05-10 14:07:04 -04:00
Eugene Yokota 12e030b49a configure the public key ring 2017-05-10 13:33:07 -04:00
tksk b66b0ff7f6 Fix: multiple execution of universal:stage task produces duplicated version strings 2017-05-05 15:45:20 +09:00
tksk a602ed760e Fix missing placeholder `INIT_SBT_VERSION' 2017-05-05 00:29:52 +09:00
tksk ab3de739d7 detect $init_sbt_version 2017-04-28 02:28:16 +09:00
tksk fb30f81f89 fix: recursive copying needs "/E" option 2017-04-28 02:27:48 +09:00
tksk ef8011df0d fix: least java version check for syncing "preloaded" 2017-04-28 02:26:49 +09:00
Eugene Yokota c35a487c9e debian build id 2017-04-26 20:08:26 -04:00
eugene yokota ab46a5a3f4 Merge pull request #158 from sbt/wip/ubuntu
Remove Java requirements for Debian/Ubuntu package
2017-04-26 19:35:24 -04:00