From 62104a16d91f558f630b78d89021543bbfe3849e Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 31 Dec 2021 14:39:49 +0100
Subject: [PATCH 01/22] Added CI file

---
 .woodpecker.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .woodpecker.yml

diff --git a/.woodpecker.yml b/.woodpecker.yml
new file mode 100644
index 0000000..f07305b
--- /dev/null
+++ b/.woodpecker.yml
@@ -0,0 +1,7 @@
+pipeline:
+  build:
+    image: 'archlinux:latest'
+    commands:
+      - pacman -Syu --needed --noconfirm base-devel
+      - makepkg -s
+      - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'

From 3be31d3ad7b1e0577892674203068844e6511d5d Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 31 Dec 2021 14:48:32 +0100
Subject: [PATCH 02/22] Hopefully made ci non-root stuff work

---
 .woodpecker.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index f07305b..96d7547 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -2,6 +2,13 @@ pipeline:
   build:
     image: 'archlinux:latest'
     commands:
-      - pacman -Syu --needed --noconfirm base-devel
+      # Update packages
+      - pacman -Syu --needed --noconfirm base-devel sudo
+      # Create non-root user to perform build & switch to their home
+      - groupadd -g 1000 builder
+      - useradd -mg builder builder
+      - cd /home/builder
+      # Build the package
       - makepkg -s
+      # Publish the package
       - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'

From 0e74092a4082bf8f8369afc2a1bd08ed4ef93848 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 31 Dec 2021 14:49:21 +0100
Subject: [PATCH 03/22] Forgot the sudo part

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 96d7547..c2eca20 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -9,6 +9,6 @@ pipeline:
       - useradd -mg builder builder
       - cd /home/builder
       # Build the package
-      - makepkg -s
+      - sudo -u builder makepkg -s
       # Publish the package
       - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'

From 0331705e4a2dc942e163af66e9849b2c36850d33 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 31 Dec 2021 14:50:18 +0100
Subject: [PATCH 04/22] can't change directory

---
 .woodpecker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index c2eca20..dfc5e1d 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,8 +7,8 @@ pipeline:
       # Create non-root user to perform build & switch to their home
       - groupadd -g 1000 builder
       - useradd -mg builder builder
-      - cd /home/builder
+      - chown -R builder:builder "$PWD"
       # Build the package
-      - sudo -u builder makepkg -s
+      - sudo -u builder -- makepkg -s
       # Publish the package
       - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'

From 4ed5b029c314d75ce81d2d24cf8c7dee14aae999 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 31 Dec 2021 14:51:28 +0100
Subject: [PATCH 05/22] Just keep trying

---
 .woodpecker.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index dfc5e1d..940888e 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,12 +3,13 @@ pipeline:
     image: 'archlinux:latest'
     commands:
       # Update packages
-      - pacman -Syu --needed --noconfirm base-devel sudo
+      - pacman -Syu --needed --noconfirm base-devel
       # Create non-root user to perform build & switch to their home
       - groupadd -g 1000 builder
       - useradd -mg builder builder
       - chown -R builder:builder "$PWD"
+      - su builder
       # Build the package
-      - sudo -u builder -- makepkg -s
+      - makepkg -s
       # Publish the package
       - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'

From 68edb240ec823512d592a1c006d7a58d1f95ee1a Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 31 Dec 2021 14:56:12 +0100
Subject: [PATCH 06/22] Give user rootless sudo

---
 .woodpecker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 940888e..48dc440 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -8,6 +8,7 @@ pipeline:
       - groupadd -g 1000 builder
       - useradd -mg builder builder
       - chown -R builder:builder "$PWD"
+      - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - su builder
       # Build the package
       - makepkg -s

From 934e20a3b6eec66701fa81cf64f0b856791e54d1 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 31 Dec 2021 14:58:23 +0100
Subject: [PATCH 07/22] Some more needed makepkg flags

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 48dc440..da0cc8b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,6 +11,6 @@ pipeline:
       - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - su builder
       # Build the package
-      - makepkg -s
+      - makepkg -s --noconfirm --needed
       # Publish the package
       - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'

From b15307ae7d8bd54069635c5336ece18d07552862 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 31 Dec 2021 15:06:22 +0100
Subject: [PATCH 08/22] Split steps

---
 .woodpecker.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index da0cc8b..739f728 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,6 +11,10 @@ pipeline:
       - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - su builder
       # Build the package
-      - makepkg -s --noconfirm --needed
+      - yes | makepkg -s --noconfirm --needed
+
+  publish:
+    image: 'archlinux:latest'
+    commands:
       # Publish the package
       - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'

From e5247f6a3645037b2bd47649c1da20684255487f Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 31 Dec 2021 15:15:54 +0100
Subject: [PATCH 09/22] Added flag to PKGBUILD

---
 PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PKGBUILD b/PKGBUILD
index a8cb74f..763b0cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,7 +50,7 @@ prepare() {
   cd "${srcdir}/joplin-${pkgver}"
   tar xvJf "${srcdir}/joplin-patches.tar.xz"
   patch -p1 < "${srcdir}/0005-All-Fixed-issue-where-synchroniser-would-try-to-upda.patch"
-  patch -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
+  patch -R -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
 
   msg2 "Tweaking lerna.json"
   local tmp_json="$(mktemp --tmpdir="$srcdir")"

From 22c8b5c954a18c0599a8064c707bba93c0d6dda4 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 31 Dec 2021 15:18:47 +0100
Subject: [PATCH 10/22] This build is broken [CI SKIP]

---
 .woodpecker.yml | 2 +-
 PKGBUILD        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 739f728..7929e92 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,7 +11,7 @@ pipeline:
       - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - su builder
       # Build the package
-      - yes | makepkg -s --noconfirm --needed
+      - makepkg -s --noconfirm --needed
 
   publish:
     image: 'archlinux:latest'
diff --git a/PKGBUILD b/PKGBUILD
index 763b0cd..a8cb74f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,7 +50,7 @@ prepare() {
   cd "${srcdir}/joplin-${pkgver}"
   tar xvJf "${srcdir}/joplin-patches.tar.xz"
   patch -p1 < "${srcdir}/0005-All-Fixed-issue-where-synchroniser-would-try-to-upda.patch"
-  patch -R -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
+  patch -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
 
   msg2 "Tweaking lerna.json"
   local tmp_json="$(mktemp --tmpdir="$srcdir")"

From 0e4e3d64825e67001a3c458142f24ea2e44f8140 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 12:21:55 +0100
Subject: [PATCH 11/22] Attempt at making patch prompt work

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7929e92..c7516cd 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,7 +11,7 @@ pipeline:
       - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - su builder
       # Build the package
-      - makepkg -s --noconfirm --needed
+      - echo "Y" | makepkg -s --noconfirm --needed
 
   publish:
     image: 'archlinux:latest'

From 70f472db083ed9a49223602a8d518a88b9cb50a4 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 12:23:59 +0100
Subject: [PATCH 12/22] Wake up CI

---
 .woodpecker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index c7516cd..ae7e29b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,11 +7,11 @@ pipeline:
       # Create non-root user to perform build & switch to their home
       - groupadd -g 1000 builder
       - useradd -mg builder builder
-      - chown -R builder:builder "$PWD"
+      - 'chown -R builder:builder "$PWD"'
       - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - su builder
       # Build the package
-      - echo "Y" | makepkg -s --noconfirm --needed
+      - 'echo "Y" | makepkg -s --noconfirm --needed'
 
   publish:
     image: 'archlinux:latest'

From 3b6a75d3b67e90b576102939e6844cd133236331 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 13:45:02 +0100
Subject: [PATCH 13/22] Possibly fixed patch prompts

---
 PKGBUILD  | 11 ++++++-----
 patch.exp | 11 +++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 patch.exp

diff --git a/PKGBUILD b/PKGBUILD
index a8cb74f..181f80c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,16 +7,16 @@
 # https://github.com/alfredopalhares/arch-pkgbuilds
 
 pkgbase="joplin"
-pkgname=('joplin' 'joplin-desktop')
+pkgname=('jjr-joplin' 'jjr-joplin-desktop')
 pkgver=2.6.10
-groups=('joplin')
+groups=('jjr-joplin')
 pkgrel=4
 install="joplin.install"
 depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
          'nss' 'orc' 'rsync' 'libvips')
 optdepends=('libappindicator-gtk3: for tray icon')
 arch=('x86_64' 'i686')
-makedepends=('git' 'yarn' 'python2' 'rsync' 'jq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips')
+makedepends=('git' 'yarn' 'python2' 'rsync' 'jq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips' 'expect')
 url="https://joplinapp.org/"
 license=('MIT')
 source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh"
@@ -46,11 +46,12 @@ prepare() {
   msg2 "Disabling husky (git hooks)"
   sed -i '/"husky": ".*"/d' "${srcdir}/joplin-${pkgver}/package.json"
 
-  msg2 "Appliying patches..."
+  msg2 "Applying patches..."
   cd "${srcdir}/joplin-${pkgver}"
   tar xvJf "${srcdir}/joplin-patches.tar.xz"
   patch -p1 < "${srcdir}/0005-All-Fixed-issue-where-synchroniser-would-try-to-upda.patch"
-  patch -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
+  # patch -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
+  expect "${srcdir}/patch.exp" "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
 
   msg2 "Tweaking lerna.json"
   local tmp_json="$(mktemp --tmpdir="$srcdir")"
diff --git a/patch.exp b/patch.exp
new file mode 100644
index 0000000..8bc6c60
--- /dev/null
+++ b/patch.exp
@@ -0,0 +1,11 @@
+#!/usr/bin/expect -f
+
+set timeout -1
+
+set patchfile [lindex $argv 0]
+
+spawn sh -c "patch -p1 < $patchfile"
+
+expect "Assume -R?"
+
+send -- "y\r"

From 6562b15bb5ca4921811fd03f3d3b6f3b95158994 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 13:46:16 +0100
Subject: [PATCH 14/22] Removed unnecessary yes call

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index ae7e29b..da637eb 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,7 +11,7 @@ pipeline:
       - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - su builder
       # Build the package
-      - 'echo "Y" | makepkg -s --noconfirm --needed'
+      - makepkg -s --noconfirm --needed'
 
   publish:
     image: 'archlinux:latest'

From 811c08a334819d34323160dac905d97338e78b78 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 13:47:29 +0100
Subject: [PATCH 15/22] Really? a single quote?

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index da637eb..7382536 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,7 +11,7 @@ pipeline:
       - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - su builder
       # Build the package
-      - makepkg -s --noconfirm --needed'
+      - makepkg -s --noconfirm --needed
 
   publish:
     image: 'archlinux:latest'

From c70f7545e4efbe965b0c1b6efea6bdb6b058522d Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 13:48:14 +0100
Subject: [PATCH 16/22] Renamed package functions

---
 PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 181f80c..661bb22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -93,7 +93,7 @@ check() {
   #npm run test || exit 0
 }
 
-package_joplin() {
+package_jjr-joplin() {
   pkgdesc="A note taking and to-do application with synchronization capabilities - CLI App"
   depends=('coreutils' 'libsecret' 'nodejs' 'python')
 
@@ -146,7 +146,7 @@ package_joplin() {
 }
 
 
-package_joplin-desktop() {
+package_jjr-joplin-desktop() {
   pkgdesc="A note taking and to-do application with synchronization capabilities - Desktop"
   depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
          'nss' 'orc')

From 8476d98b67b9eb00920797b53ff3147a261f9e09 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 13:51:25 +0100
Subject: [PATCH 17/22] Added patch.exp to sources list

---
 PKGBUILD | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 661bb22..90abb82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,12 +21,13 @@ url="https://joplinapp.org/"
 license=('MIT')
 source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh"
   "joplin-${pkgver}.tar.gz::https://github.com/laurent22/joplin/archive/v${pkgver}.tar.gz"
-  "joplin-patches.tar.xz")
+  "joplin-patches.tar.xz" "patch.exp")
 sha256sums=('c7c5d8b0ff9edb810ed901ea21352c9830bfa286f3c18b1292deca5b2f8febd2'
             'a450284fe66d89aa463d129ce8fff3a0a1a783a64209e4227ee47449d5737be8'
             'dc1236767ee055ea1d61f10e5266a23e70f3e611b405fe713ed24ca18ee9eeb5'
             '1994cf5a32cf72f60f0455ad8204ff1d5ebb70933ad50ade78431fa359b561c6'
-            '43f86e589f20141d7a2478fd12b4aa2dc73c6a52d7037137515358f4cd65616f')
+            '43f86e589f20141d7a2478fd12b4aa2dc73c6a52d7037137515358f4cd65616f'
+            '2b135b769c3f5da630ac06da30ef15c79e286e5355e98e26e04b59c68f7904bd')
 
 # local npm cache directory
 _npm_cache="npm-cache"

From ccee9800f510faa4057c017bbf852cc4887ecb52 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 13:55:21 +0100
Subject: [PATCH 18/22] How was npm not a makedepend

---
 PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PKGBUILD b/PKGBUILD
index 90abb82..06ebaef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss'
          'nss' 'orc' 'rsync' 'libvips')
 optdepends=('libappindicator-gtk3: for tray icon')
 arch=('x86_64' 'i686')
-makedepends=('git' 'yarn' 'python2' 'rsync' 'jq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips' 'expect')
+makedepends=('git' 'npm' 'yarn' 'python2' 'rsync' 'jq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips' 'expect')
 url="https://joplinapp.org/"
 license=('MIT')
 source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh"

From 7803e08cb4146df78e8bbe732ca54e1f97ba9e71 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 14:23:17 +0100
Subject: [PATCH 19/22] Hopefully allow multiple packages to be published

---
 .woodpecker.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7382536..1a4b02c 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -17,4 +17,5 @@ pipeline:
     image: 'archlinux:latest'
     commands:
       # Publish the package
-      - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'
+      - 'ls -1 *.pkg* | xargs -I{} curl -F "file=@{}" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'
+      # - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'

From 876ae76b22865fdbdb06f250dab2d89b0c2cf423 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 15:17:29 +0100
Subject: [PATCH 20/22] Let's test this after an update [CI SKIP]

---
 .woodpecker.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 1a4b02c..72d28d3 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -17,5 +17,6 @@ pipeline:
     image: 'archlinux:latest'
     commands:
       # Publish the package
-      - 'ls -1 *.pkg* | xargs -I{} curl -F "file=@{}" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'
+      - 'for pkg in $(ls -1 *.pkg*); do curl -F "file=@{}" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish; done'
+      # - 'ls -1 *.pkg* | xargs -I{} curl -F "file=@{}" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'
       # - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'

From da9bb8cf2e1e996f5b18b6ea920c4f1afd10b698 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 15:18:11 +0100
Subject: [PATCH 21/22] Ffs dude [CI SKIP]

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 72d28d3..bbb3ea8 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -17,6 +17,6 @@ pipeline:
     image: 'archlinux:latest'
     commands:
       # Publish the package
-      - 'for pkg in $(ls -1 *.pkg*); do curl -F "file=@{}" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish; done'
+      - 'for pkg in $(ls -1 *.pkg*); do curl -F "file=@${pkg}" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish; done'
       # - 'ls -1 *.pkg* | xargs -I{} curl -F "file=@{}" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'
       # - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'

From cc05207f8d74f48ae7ba7ffa7790332a8899957c Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 13 Feb 2022 12:53:56 +0100
Subject: [PATCH 22/22] Switched to vieter server

---
 .woodpecker.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 1a4b02c..ea31fdc 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -15,7 +15,9 @@ pipeline:
 
   publish:
     image: 'archlinux:latest'
+    secrets:
+      - api_key
     commands:
       # Publish the package
-      - 'ls -1 *.pkg* | xargs -I{} curl -F "file=@{}" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'
+      - 'ls -1 *.pkg* | xargs -I{} curl -XPOST -T "{}" -H "X-API-KEY: $API_KEY" https://arch.r8r.be/publish'
       # - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'