Commit Graph

408 Commits

Author SHA1 Message Date
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
Eugene Yokota 58cf5f95ca Remove Java requirements for Debian/Ubuntu package
Ref sbt/sbt#2931
Ref sbt/sbt#3105

Requiring `"openjdk-8-jdk"` prevents sbt 0.13.15 update on Ubuntu 14.04 LTS "Trusty Tahr."
Since there seems to be no reasonable way to depend on JDK 6, 7, or 8 without breaking some distro or use case, I'm going to remove the requirement here.
2017-04-26 19:25:16 -04:00
Eugene Yokota c86f64b451 support for packaging sbt 1 2017-04-18 13:28:12 -04:00
Eugene Yokota 70c725fc3b workaround sbt-native-packager issue 2017-04-12 23:41:28 -04:00
eugene yokota d5f8aff4c2 Merge pull request #156 from sbt/wip/150
Workaround for brew test sbt
2017-04-12 20:20:57 -04:00
eugene yokota 7800a73c82 Merge pull request #155 from sbt/wip/149
Replace realpath with something Mac compat
2017-04-12 20:20:43 -04:00
eugene yokota b5c7aa799e Merge pull request #153 from sbt/wip/rpm
Remove RPM requirements
2017-04-12 20:20:20 -04:00
Eugene Yokota 36e8246825 Workaround for brew test sbt
brew test sbt doesn't detect java version correctly. This change makes the script a bit more safer.

Fixes #150
2017-04-12 07:57:27 -04:00
Eugene Yokota 226c34a7bf Replace realpath with something Mac compat
Mac by default doesn't have realpath(1).
This replaces it with an equivalent bash script, so we can reduce script replacements on Homebrew.

Fixes #149
2017-04-12 07:53:43 -04:00
Eugene Yokota b2b84cc052 Remove RPM requirements
Fixes #151
Ref #144, #62

We are removing RPM requirements for JDK because it's not possible to reliably specify JDK 1.8 across different distros.
2017-04-12 05:20:00 -04:00
eugene yokota 4043810dda Fix installer name 2017-04-09 07:37:42 -07:00
eugene yokota bd18a0c2c6 Fix Windows script 2017-04-08 23:35:20 -07:00
eugene yokota 70ad35ebb6 Minor Windows fixes 2017-04-07 22:13:12 -07:00
Eugene Yokota 0f8b3b0ffb Fix bash script 2017-04-07 04:13:13 -04:00
Dale Wijnand 7ac685831c Merge pull request #148 from sbt/wip/mkdir2
Make full installer optional
2017-04-07 07:44:54 +01:00
Eugene Yokota 04bc5a9dd2 Publish full installers to lightbend organization
Offline installation exceeds 50MB file limit for OSS organization.
2017-04-07 01:40:05 -04:00
Eugene Yokota 2fad446e67 Make offline installer optional 2017-04-07 00:56:55 -04:00
Eugene Yokota d3ca77a95d mkdir before rsync
Fixes sbt/sbt#3005
2017-04-07 00:32:16 -04:00
Dale Wijnand f760ef41fb Merge pull request #147 from sbt/wip/mkdir
mkdir -p
2017-03-17 21:46:42 +00:00
Eugene Yokota 1ea1f5d52d mkdir -p
Fixes sbt/sbt#3005
2017-03-17 16:54:04 -04:00
eugene yokota 304dd726dc Merge pull request #146 from monktastic/patch-1
Preserve quotes in system properties
2017-03-16 17:53:12 -07:00
monktastic c7f3be3b58 Preserve quotes in system properties
Today you cannot have spaces in system properties:

$ sbt -Dfoo="bar baz" ...

It passes [-Dfoo=bar] and [baz] to java (see https://github.com/sbt/sbt/issues/2787).

This change allows you to do:

$ sbt "-Dfoo=bar baz"

which will pass ["-Dfoo=bar baz"]. And both of these two:

$ sbt "-Dfoo=bar"
$ sbt -Dfoo=bar

still work, passing [-Dfoo=bar].
2017-03-16 17:01:57 -07:00
Eugene Yokota 8f0d61ec0d Clean dist 2017-03-11 16:34:18 -05:00
Eugene Yokota e4dae9a120 Fix Java 9 support 2017-03-11 16:34:10 -05:00
Eugene Yokota a867202ea5 Add ivy-releases to resolver 2017-03-11 14:29:58 -05:00
Dale Wijnand c6c8470f98 Merge pull request #145 from sbt/wip/offline
add offline installation
2017-03-10 22:19:02 +00:00
Eugene Yokota cea5d178d8 add offline installtion
To utilize local preloaded repo, this will create lib/ directory with all artifacts required for sbt. This can be rsynced to the preloaded repo.
2017-03-10 16:56:00 -05:00
eugene yokota 479a28ac40 Merge pull request #139 from sbt/wip/linux
Update the build and fix Linux installers
2017-03-09 23:33:14 -05:00
eugene yokota 21b7fdbd0f Merge branch 'master' into wip/linux 2017-03-09 23:32:47 -05:00
eugene yokota 37e970cdcd Merge pull request #143 from sbt/wip/jdk9
add JDK 9 support
2017-03-09 23:30:38 -05:00