Merge pull request 'hotfix/1.2.2' (#39) from hotfix/1.2.2 into github/master

Reviewed-on: #39

.drone.yml

@@ -1,187 +0,0 @@
-# Variables
-tag: &tag latest
-repo: &repo phoenix.ipv64.de/kirbylink/warp4j
-branch: &branch master
-dry_run: &dry_run false
-step_name: &step_name warp4j
-pipeline_name: &pipeline_name warp4j build and push
-notification_name: &notification_name Send Notification
-
-# Basic build options
-x-step: &default_build_option
-  image: plugins/docker
-  settings:
-    dry_run: *dry_run
-    mirror: https://registry.phoenix.ipv64.de
-    repo: *repo
-    tags:
-    - *tag
-
-x-step: &default_notification_option
-  image: phoenix.ipv64.de/kirbylink/drone-gotify:latest
-  settings:
-    gotifytoken:
-      from_secret: plugin_gotifytoken
-    gotifyendpoint:
-      from_secret: plugin_gotifyendpoint
-    gotifytitle: *step_name
-    gotifypriority: 5
-
-kind: pipeline
-type: docker
-platform:
-  os: linux
-  arch: arm64
-name: *pipeline_name
-
-steps:
-- name: *step_name
-  <<: *default_build_option
-  settings:
-    dockerfile: Dockerfile
-
-- name: *notification_name
-  <<: *default_notification_option
-  settings:
-    message: >
-      {{#success build.status}}
-        Build of docker image on build {{build.number}} succeeded on {{repo.name}}. Build link: {{build.link}}
-      {{else}}
-        WARNING. Build of docker image on build {{build.number}} failed on {{repo.name}}. Build link: {{build.link}}
-      {{/success}}
-  when:
-    status: [ success, failure ]
-
-trigger:
-  branch:
-  - *branch
-  event:
-  - push
-  - custom
-
----
-
-# Variables
-tag: &tag testing
-repo: &repo phoenix.ipv64.de/kirbylink/warp4j
-branch: &branch develop
-dry_run: &dry_run false
-step_name: &step_name warp4j
-pipeline_name: &pipeline_name warp4j build and push (testing)
-notification_name: &notification_name Send Notification
-
-# Basic build options
-x-step: &default_build_option
-  image: plugins/docker
-  settings:
-    dry_run: *dry_run
-    mirror: https://registry.phoenix.ipv64.de
-    repo: *repo
-    tags:
-    - *tag
-
-x-step: &default_notification_option
-  image: phoenix.ipv64.de/kirbylink/drone-gotify:latest
-  settings:
-    gotifytoken:
-      from_secret: plugin_gotifytoken
-    gotifyendpoint:
-      from_secret: plugin_gotifyendpoint
-    gotifytitle: *step_name
-    gotifypriority: 5
-
-kind: pipeline
-type: docker
-platform:
-  os: linux
-  arch: arm64
-name: *pipeline_name
-
-steps:
-- name: *step_name
-  <<: *default_build_option
-  settings:
-    dockerfile: Dockerfile
-
-- name: *notification_name
-  <<: *default_notification_option
-  settings:
-    message: >
-      {{#success build.status}}
-        Build of test docker image on build {{build.number}} succeeded on {{repo.name}}. Build link: {{build.link}}
-      {{else}}
-        WARNING. Build of docker image on build {{build.number}} failed on {{repo.name}}. Build link: {{build.link}}
-      {{/success}}
-  when:
-    status: [ success, failure ]
-
-trigger:
-  branch:
-  - *branch
-  event:
-  - push
-  - custom
-  
----
-
-# Variables
-tag: &tag testing
-repo: &repo phoenix.ipv64.de/kirbylink/warp4j
-dry_run: &dry_run true
-step_name: &step_name warp4j
-pipeline_name: &pipeline_name warp4j build only (testing)
-notification_name: &notification_name Send Notification
-
-# Basic build options
-x-step: &default_build_option
-  image: plugins/docker
-  settings:
-    dry_run: *dry_run
-    mirror: https://registry.phoenix.ipv64.de
-    repo: *repo
-    tags:
-    - *tag
-
-x-step: &default_notification_option
-  image: phoenix.ipv64.de/kirbylink/drone-gotify:latest
-  settings:
-    gotifytoken:
-      from_secret: plugin_gotifytoken
-    gotifyendpoint:
-      from_secret: plugin_gotifyendpoint
-    gotifytitle: *step_name
-    gotifypriority: 5
-
-kind: pipeline
-type: docker
-platform:
-  os: linux
-  arch: arm64
-name: *pipeline_name
-
-steps:
-- name: *step_name
-  <<: *default_build_option
-  settings:
-    dockerfile: Dockerfile
-
-- name: warp4j x64
-  <<: *default_build_option
-  settings:
-    dockerfile: Dockerfile_x64
-
-- name: *notification_name
-  <<: *default_notification_option
-  settings:
-    message: >
-      {{#success build.status}}
-        Test build of docker image on build {{build.number}} succeeded on {{repo.name}}. Build link: {{build.link}}
-      {{else}}
-        WARNING. Test build of docker image on build {{build.number}} failed on {{repo.name}}. Build link: {{build.link}}
-      {{/success}}
-  when:
-    status: [ success, failure ]
-
-trigger:
-  event:
-  - pull_request

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [v1.2.2] - 2025-02-01
 ### Fixed
 - Submodules removed when Jdep collects necessary modules
+- install.sh: Fix GitHubs warp4j download link
 
 ## [v1.2.1] - 2025-01-17
 ### Fixed
@@ -35,10 +36,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [origin warp4j] - 2019-02-28
 - See origin repository: https://github.com/guziks/warp4j
 
-[unreleased]: https://git.phoenix.ipv64.de/public/warp4j/compare/master...HEAD
+[unreleased]: https://github.com/kirbylink/warp4j/compare/master...HEAD
-[v1.2.2]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.2.1...v1.2.2
+[v1.2.2]: https://github.com/kirbylink/warp4j/compare/v1.2.1...v1.2.2
-[v1.2.1]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.2.0...v1.2.1
+[v1.2.1]: https://github.com/kirbylink/warp4j/compare/v1.2.0...v1.2.1
-[v1.2.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.1.0...v1.2.0
+[v1.2.0]: https://github.com/kirbylink/warp4j/compare/v1.1.0...v1.2.0
-[v1.1.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.0.0...v1.1.0
+[v1.1.0]: https://github.com/kirbylink/warp4j/compare/v1.0.0...v1.1.0
-[v1.0.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/stable...v1.0.0
+[v1.0.0]: https://github.com/kirbylink/warp4j/compare/stable...v1.0.0
 [origin warp4j]: https://github.com/guziks/warp4j

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/master/install.sh | /bin/sh -s
+RUN curl -s https://github.com/kirbylink/warp4j/raw/branch/master/install.sh | /bin/sh -s
 ENTRYPOINT [ "/usr/local/bin/warp4j" ]

Dockerfile_x64

@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \
         zip \
     && rm -rf /var/lib/apt/lists/*
 RUN curl -fsSL -o /tmp/warp-packer \
-        https://git.phoenix.ipv64.de/public/warp/releases/download/1.0.0/linux-x64.warp-packer \
+        https://github.com/kirbylink/warp/releases/download/1.0.0/linux-x64.warp-packer \
     && install -D \
         --mode=755 \
         --owner=root \

INSTALL.md

@@ -5,17 +5,17 @@ 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
+curl -s https://github.com/kirbylink/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:
+First install [warp-packer](https://github.com/kirbylink/warp/releases) and ensure other common tools available: `awk`, `curl`, `file`, `grep`, `sed`, `sort`, `tar`, `unzip`, optional: `zip`. Then install `warp4j` like this:
 
 ```
 $ LOCATION=/usr/local/bin \
-LINK=https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/warp4j \
+LINK=https://github.com/kirbylink/warp4j/raw/branch/master/warp4j \
 TEMP_LOCATION=/tmp/warp4j \
 bash -c 'curl -fsSL -o $TEMP_LOCATION $LINK && \
 sudo install -D \

README.md

@@ -19,8 +19,8 @@ Just put both `warp4j` and `warp-packer` somewhere in your PATH and run `warp4j
 
 Curl one-liner installs the latest versions of both `warp4j` and `warp-packer`:
 
-```sh
+```
-bash -c "$(curl -fsSL https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/install.sh)"
+bash -c "$(curl -fsSL https://github.com/kirbylink/warp4j/raw/refs/heads/master/install.sh)"
 ```
 
 This script will show missing dependencies (if there are any); they must be installed with your package manager.

install.sh

@@ -16,9 +16,9 @@ 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_X64_URL=https://github.com/kirbylink/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
+LIN_AARCH64_URL=https://github.com/kirbylink/warp/releases/download/1.0.0/linux-aarch64.warp-packer
-MAC_URL=https://git.phoenix.ipv64.de/public/warp/releases/download/1.0.0/macos-x64.warp-packer
+MAC_URL=https://github.com/kirbylink/warp/releases/download/1.0.0/macos-x64.warp-packer
 
 # platform architecture
 X64=x64
@@ -128,7 +128,7 @@ get_missing_deps() {
     fi
 }
 
-WARP4J_LINK="https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/warp4j"
+WARP4J_LINK="https://github.com/kirbylink/warp4j/raw/refs/heads/master/warp4j"
 
 echo "Getting information about warp-packer releases..."
 WARP_LINK=$(get_warp_link $THIS_PLATFORM $THIS_ARCHITECTURE)