Merge branch 'main' into fix-mullvad-vpn

silentJET85 · Jan 1, 2025 · a614ce7 · a614ce7
2 parents db66cef + bb367f3
commit a614ce7
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 3 deletions.
diff --git a/.github/workflows/tests-01-main.yml b/.github/workflows/tests-01-main.yml
@@ -51,7 +51,16 @@ jobs:
                 echo "Failed to detect ${APP} as installed" >&2
                 exit 1
               else
-                ./deb-get purge "${APP}"
+                PUBLISHED_VER=$(./deb-get show "${APP}" | grep "Published:" | sed -E 's|\s*Published:\s*([^\s]*).*|\1|')
+                echo "Published version: ${PUBLISHED_VER}"
+                INSTALLED_VER=$(./deb-get show "${APP}" | grep "Installed:" | sed -E 's|\s*Installed:\s*([^\s]*).*|\1|')
+                echo "Installed version: ${INSTALLED_VER}"
+                if [ -n "${PUBLISHED_VER}" ] && [ "${PUBLISHED_VER}" != "${INSTALLED_VER}" ]; then
+                    echo "Versions do not match. The package's VERSION_PUBLISHED variable may need to be changed." >&2
+                    exit 1
+                else
+                    ./deb-get purge "${APP}"
+                fi
               fi
             fi
           done
diff --git a/01-main/manifest b/01-main/manifest
@@ -42,6 +42,7 @@ cronopete
 crossover
 crow-translate
 cryptomator
+cw-tail
 dbeaver-ce
 deadbeef-static
 deborah
@@ -241,6 +242,7 @@ rpi-imager
 rstudio
 rstudio-server
 rustdesk
+schildichat-desktop
 sejda-desktop
 session-desktop
 shutter-encoder

diff --git a/01-main/packages/cw-tail b/01-main/packages/cw-tail
@@ -0,0 +1,10 @@
+DEFVER=1
+ARCHS_SUPPORTED="amd64 arm64"
+get_github_releases "lucagrulla/cw" "latest"
+if [ "${ACTION}" != prettylist ]; then
+    URL="$(grep -m 1 "browser_download_url.*${HOST_ARCH}\.deb\"" "${CACHE_FILE}" | cut -d '"' -f 4)"
+    VERSION_PUBLISHED="$(sed -E 's|.*download/v([^/]*).*|\1|' <<< "${URL}")"
+fi
+PRETTY_NAME="cw"
+WEBSITE="https://www.lucagrulla.com/cw"
+SUMMARY="The best way to tail AWS CloudWatch Logs from your terminal."
diff --git a/01-main/packages/eversticky b/01-main/packages/eversticky
@@ -2,7 +2,7 @@ DEFVER=1
 get_github_releases "itsmejoeeey/eversticky" "latest"
 if [ "${ACTION}" != prettylist ]; then
     URL="$(grep -m 1 "browser_download_url.*\.deb\"" "${CACHE_FILE}" | cut -d '"' -f 4)"
-    VERSION_PUBLISHED="$(cut -d '_' -f 2 <<< "${URL}")"
+    VERSION_PUBLISHED="$(sed -E 's|.*download/v([^/]*).*|\1|' <<< "${URL}")"
 fi
 PRETTY_NAME="EverSticky"
 WEBSITE="https://eversticky.joeeey.com/"

diff --git a/01-main/packages/goreleaser-pro b/01-main/packages/goreleaser-pro
@@ -3,7 +3,7 @@ ARCHS_SUPPORTED="amd64 arm64 armhf i386"
 get_github_releases "goreleaser/goreleaser-pro" "latest"
 if [ "${ACTION}" != "prettylist" ]; then
     URL=$(grep -m 1 "browser_download_url.*${HOST_ARCH}\.deb\"" "${CACHE_FILE}" | cut -d'"' -f4)
-    VERSION_PUBLISHED=$(cut -d'/' -f8 <<<"${URL}" | sed 's|v||')
+    VERSION_PUBLISHED=$(cut -d'/' -f8 <<<"${URL}" | sed -E 's|v([^\-]*)\-(pro)|\1\~\2|')
 fi
 PRETTY_NAME="Goreleaser Pro"
 WEBSITE="https://goreleaser.com/pro"

diff --git a/01-main/packages/schildichat-desktop b/01-main/packages/schildichat-desktop
@@ -0,0 +1,8 @@
+DEFVER=1
+ASC_KEY_URL="https://apt.supercable.onl/super-apt-repo.key"
+APT_LIST_NAME="schildichat"
+APT_REPO_URL="https://apt.supercable.onl/debian/ all main"
+APT_REPO_OPTIONS="arch=${HOST_ARCH}"
+PRETTY_NAME="SchildiChat"
+WEBSITE="https://schildi.chat/"
+SUMMARY="SchildiChat is a feature-rich messenger for Matrix based on Element with some extras and tweaks."