From d8bd25b4380a8e1fec5a6f123d5ca283ee3c6793 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Sat, 6 May 2023 10:06:42 +0200
Subject: [PATCH] Centralize mv logic

---
 .woodpecker.yml  |  4 ----
 platform_jars.sh | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index d370844..a5004cc 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -14,10 +14,6 @@ pipeline:
     pull: true
     commands:
       - ./platform_jars.sh
-      - mv launcher-dist/build/jpackage/*.deb public/inceptum.deb
-      - mv launcher-dist/build/jpackage/*.msi public/inceptum.msi
-      - for f in launcher-dist/build/libs/Inceptum-*-*-*.jar; do mv "$f" "public/Inceptum-$${f##*-}"; done
-      - mv public/Inceptum-fat.jar public/Inceptum.jar
   build_wrapper:
     image: gradle:jdk19-jammy
     commands:
diff --git a/platform_jars.sh b/platform_jars.sh
index c8913e0..96ff40a 100755
--- a/platform_jars.sh
+++ b/platform_jars.sh
@@ -1,6 +1,18 @@
 #!/bin/bash
 set -xe
+
+function moveartifacts {
+  mv launcher-dist/build/jpackage/*.deb public/inceptum.deb
+  mv launcher-dist/build/jpackage/*.msi public/inceptum.msi
+  for f in launcher-dist/build/libs/Inceptum-*-*-*.jar; do mv "$f" "public/Inceptum-${f##*-}"; done
+}
+
 gradle --build-cache :launcher-dist:build -Pflavor=fat -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
+moveartifacts
+mv public/Inceptum-fat.jar public/Inceptum.jar
 gradle --build-cache :launcher-dist:build :launcher-dist:jpackage -Pflavor=windows -Ppublic -Pcrosscompile -Ptimestamp=${CI_PIPELINE_STARTED}
+moveartifacts
 gradle --build-cache :launcher-dist:build :launcher-dist:jpackage -Pflavor=linux -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
-gradle --build-cache :launcher-dist:build -Pflavor=macos -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
\ No newline at end of file
+moveartifacts
+gradle --build-cache :launcher-dist:build -Pflavor=macos -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
+moveartifacts
\ No newline at end of file