Merge pull request 'Cleaning up code and setting temporary download url to develop branch' (#21) from feature/cleanup into develop

Reviewed-on: #21

Dockerfile

@@ -5,5 +5,5 @@ RUN apt-get update && apt-get install -y \
         unzip \
         zip \
     && rm -rf /var/lib/apt/lists/*
-RUN curl -s https://git.phoenix.ipv64.de/public/warp4j/raw/branch/feature/update_install_script/install | /bin/sh -s
+RUN curl -s https://git.phoenix.ipv64.de/public/warp4j/raw/branch/develop/install.sh | /bin/sh -s
 ENTRYPOINT [ "/usr/local/bin/warp4j" ]

INSTALL.md

@@ -2,6 +2,13 @@
 
 Here are several more ways to install `warp4j`.
 
+## Install script
+Run the [install.sh](./install.sh) script from source or use the following command:
+```sh
+curl -s https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/install.sh | /bin/sh -s
+```
+
+
 ## Manual
 
 First install [warp-packer](https://git.phoenix.ipv64.de/public/warp/releases) and ensure other common tools available: `awk`, `curl`, `file`, `grep`, `sed`, `sort`, `tar`, `unzip`, optional: `zip`. Then install `warp4j` like this:
@@ -22,14 +29,4 @@ Previous command can be also used to upgrade to the latest version.
 
 ## Docker
 
-See docker hub [page](https://hub.docker.com/r/guziks/warp4j).
-
-## Moor
-
-Instead of direct `docker run` command you can make a launcher with [moor](https://github.com/guziks/moor):
-
-```
-$ moor guziks/warp4j:stable warp4j
-```
-
-Then use as an ordinary command.
+See [Dockerfile](./Dockerfile)

install.sh

@@ -14,6 +14,7 @@ fail() {
 LIN=linux
 MAC=macos
 WIN=windows
+
 # Urls
 LIN_X64_URL=https://git.phoenix.ipv64.de/public/warp/releases/download/1.0.0/linux-x64.warp-packer
 LIN_AARCH64_URL=https://git.phoenix.ipv64.de/public/warp/releases/download/1.0.0/linux-aarch64.warp-packer
@@ -43,7 +44,8 @@ get_this_architecture() {
         x86_64) echo $X64 ;;
         aarch64) echo $AARCH64 ;;
         *)
-            fail_with "Unsupported machine $this_machine"
+            echo "Error: Unsupported machine $this_machine" >&2
+            fail
         ;;
     esac
 }