Skip to content

Commit 28b9b7f

Browse files
committed
Merge branch 'release/0.7.1'
2 parents 9c320e1 + 834d72f commit 28b9b7f

File tree

8 files changed

+30
-11
lines changed

8 files changed

+30
-11
lines changed

codegen/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<parent>
77
<groupId>io.reactiverse</groupId>
88
<artifactId>es4x-parent</artifactId>
9-
<version>0.7.0</version>
9+
<version>0.7.1</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212

1313
<modelVersion>4.0.0</modelVersion>
1414

1515
<artifactId>es4x-codegen</artifactId>
16-
<version>0.7.0</version>
16+
<version>0.7.1</version>
1717

1818
<properties>
1919
</properties>

docs/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Fast, unopinionated,<br/> minimalist JavaScript runtime for [Vert.x](https://vertx.io)
22

33
```
4-
npx es4x-cli init
4+
$ npm install -g es4x-pm
5+
$ es4x
56
```
67

78
[![Travis branch](https://img.shields.io/travis/reactiverse/es4x/master.svg?style=for-the-badge)](https://travis-ci.com/reactiverse/es4x)

es4x/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<parent>
77
<groupId>io.reactiverse</groupId>
88
<artifactId>es4x-parent</artifactId>
9-
<version>0.7.0</version>
9+
<version>0.7.1</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212

1313
<modelVersion>4.0.0</modelVersion>
1414

1515
<artifactId>es4x</artifactId>
16-
<version>0.7.0</version>
16+
<version>0.7.1</version>
1717

1818
<properties>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

pm/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<parent>
77
<groupId>io.reactiverse</groupId>
88
<artifactId>es4x-parent</artifactId>
9-
<version>0.7.0</version>
9+
<version>0.7.1</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212

1313
<modelVersion>4.0.0</modelVersion>
1414

1515
<artifactId>es4x-pm</artifactId>
16-
<version>0.7.0</version>
16+
<version>0.7.1</version>
1717

1818
<properties>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

pm/src/assembly/bin/es4x

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
#!/bin/sh
22
(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
33

4-
basedir=`dirname "$0"`
4+
# fight simlinks and avoid readlink -f which doesn't exist on Darwin and Solaris
5+
pushd . > /dev/null
6+
basedir="${BASH_SOURCE[0]}";
7+
while([ -h "${basedir}" ]); do
8+
cd "`dirname "${basedir}"`"
9+
basedir="$(readlink "`basename "${basedir}"`")";
10+
done
11+
cd "`dirname "${basedir}"`" > /dev/null
12+
basedir="`pwd`";
13+
popd > /dev/null
514

615
case `uname` in
716
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;

pm/src/main/java/io/reactiverse/es4x/commands/DockerfileCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void run() throws CLIException {
5555
if (in == null) {
5656
throw new IllegalStateException("Cannot load .dockerignore template.");
5757
}
58-
Files.copy(in, dockerfile.toPath());
58+
Files.copy(in, dockerignore.toPath());
5959
} catch (IOException e) {
6060
throw new CLIException(e.getMessage(), e);
6161
}

pm/src/main/java/io/reactiverse/es4x/commands/InstallCommand.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,16 @@ private void createUNIXScript(File bin, String launcher) throws IOException {
283283
"#!/bin/sh\n" +
284284
"(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix\n" +
285285
"\n" +
286-
"basedir=`dirname \"$0\"`\n" +
286+
"# fight simlinks and avoid readlink -f which doesn't exist on Darwin and Solaris\n" +
287+
"pushd . > /dev/null\n" +
288+
"basedir=\"${BASH_SOURCE[0]}\";\n" +
289+
"while([ -h \"${basedir}\" ]); do\n" +
290+
" cd \"`dirname \"${basedir}\"`\"\n" +
291+
" basedir=\"$(readlink \"`basename \"${basedir}\"`\")\";\n" +
292+
"done\n" +
293+
"cd \"`dirname \"${basedir}\"`\" > /dev/null\n" +
294+
"basedir=\"`pwd`\";\n" +
295+
"popd > /dev/null\n" +
287296
"\n" +
288297
"case `uname` in\n" +
289298
" *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;\n" +

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>io.reactiverse</groupId>
1313
<artifactId>es4x-parent</artifactId>
14-
<version>0.7.0</version>
14+
<version>0.7.1</version>
1515
<packaging>pom</packaging>
1616

1717
<properties>

0 commit comments

Comments
 (0)