Merge branch 'release/0.7.1'

reactiverse · Jan 10, 2019 · 28b9b7f · 28b9b7f
2 parents 9c320e1 + 834d72f
commit 28b9b7f
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 11 deletions.
diff --git a/codegen/pom.xml b/codegen/pom.xml
@@ -6,14 +6,14 @@
   <parent>
     <groupId>io.reactiverse</groupId>
     <artifactId>es4x-parent</artifactId>
-    <version>0.7.0</version>
+    <version>0.7.1</version>
     <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>es4x-codegen</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1</version>
 
   <properties>
   </properties>

diff --git a/docs/index.md b/docs/index.md
@@ -1,7 +1,8 @@
 # Fast, unopinionated,<br/> minimalist JavaScript runtime for [Vert.x](https://vertx.io)
 
 ```
-npx es4x-cli init
+$ npm install -g es4x-pm
+$ es4x
 ```
 
 [![Travis branch](https://img.shields.io/travis/reactiverse/es4x/master.svg?style=for-the-badge)](https://travis-ci.com/reactiverse/es4x)

diff --git a/es4x/pom.xml b/es4x/pom.xml
@@ -6,14 +6,14 @@
   <parent>
     <groupId>io.reactiverse</groupId>
     <artifactId>es4x-parent</artifactId>
-    <version>0.7.0</version>
+    <version>0.7.1</version>
     <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>es4x</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/pm/pom.xml b/pm/pom.xml
@@ -6,14 +6,14 @@
   <parent>
     <groupId>io.reactiverse</groupId>
     <artifactId>es4x-parent</artifactId>
-    <version>0.7.0</version>
+    <version>0.7.1</version>
     <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>es4x-pm</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/pm/src/assembly/bin/es4x b/pm/src/assembly/bin/es4x
@@ -1,7 +1,16 @@
 #!/bin/sh
 (set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
 
-basedir=`dirname "$0"`
+# fight simlinks and avoid readlink -f which doesn't exist on Darwin and Solaris
+pushd . > /dev/null
+basedir="${BASH_SOURCE[0]}";
+while([ -h "${basedir}" ]); do
+    cd "`dirname "${basedir}"`"
+    basedir="$(readlink "`basename "${basedir}"`")";
+done
+cd "`dirname "${basedir}"`" > /dev/null
+basedir="`pwd`";
+popd  > /dev/null
 
 case `uname` in
     *CYGWIN*) basedir=`cygpath -w "$basedir"`;;

diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/DockerfileCommand.java b/pm/src/main/java/io/reactiverse/es4x/commands/DockerfileCommand.java
@@ -55,7 +55,7 @@ public void run() throws CLIException {
         if (in == null) {
           throw new IllegalStateException("Cannot load .dockerignore template.");
         }
-        Files.copy(in, dockerfile.toPath());
+        Files.copy(in, dockerignore.toPath());
       } catch (IOException e) {
         throw new CLIException(e.getMessage(), e);
       }

diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/InstallCommand.java b/pm/src/main/java/io/reactiverse/es4x/commands/InstallCommand.java
@@ -283,7 +283,16 @@ private void createUNIXScript(File bin, String launcher) throws IOException {
       "#!/bin/sh\n" +
       "(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix\n" +
       "\n" +
-      "basedir=`dirname \"$0\"`\n" +
+      "# fight simlinks and avoid readlink -f which doesn't exist on Darwin and Solaris\n" +
+      "pushd . > /dev/null\n" +
+      "basedir=\"${BASH_SOURCE[0]}\";\n" +
+      "while([ -h \"${basedir}\" ]); do\n" +
+      "    cd \"`dirname \"${basedir}\"`\"\n" +
+      "    basedir=\"$(readlink \"`basename \"${basedir}\"`\")\";\n" +
+      "done\n" +
+      "cd \"`dirname \"${basedir}\"`\" > /dev/null\n" +
+      "basedir=\"`pwd`\";\n" +
+      "popd  > /dev/null\n" +
       "\n" +
       "case `uname` in\n" +
       "    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;\n" +

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>io.reactiverse</groupId>
   <artifactId>es4x-parent</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1</version>
   <packaging>pom</packaging>
 
   <properties>