From cc359bd3e35f082adc8ac19a7236cb1ba0f38a4f Mon Sep 17 00:00:00 2001 From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com> Date: Wed, 14 Jan 2026 10:26:47 -0700 Subject: [PATCH] Modify OpenBSD package creation for ZoiteChat Update package creation script for ZoiteChat to include full package path and comment. --- .github/workflows/openbsd-build.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/openbsd-build.yml b/.github/workflows/openbsd-build.yml index 42d9a70e..81a7e47f 100644 --- a/.github/workflows/openbsd-build.yml +++ b/.github/workflows/openbsd-build.yml @@ -73,37 +73,43 @@ jobs: version="$(meson introspect --projectinfo build | sed -n 's/.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p')" pkg_name="zoitechat-${version}" + pkg_file="${pkg_name}.tgz" plist="$work/openbsd-plist" desc="$work/DESCR" cat >"$desc" <<'EOF' - ZoiteChat is an IRC client (HexChat-derived) with a GTK UI and optional tools. - EOF +ZoiteChat is an IRC client (HexChat-derived) with a GTK UI and optional tools. +EOF { - echo "@name ${pkg_name}" echo "@cwd /usr/local" + # Files + symlinks find "$snap/usr/local" \( -type f -o -type l \) -print \ | LC_ALL=C sort \ | sed "s#^$snap/usr/local/##" + # Directories (reverse so children removed first) find "$snap/usr/local" -mindepth 1 -type d -print \ | LC_ALL=C sort -r \ | sed "s#^$snap/usr/local/##" \ | sed 's#^#@dir #' } > "$plist" + # OpenBSD pkg_create: COMMENT is set via -D COMMENT=... (mandatory), no -c flag exists. + # Create the .tgz in $work so we can copy it back out. + cd "$work" pkg_create \ -B "$snap" \ -p /usr/local \ -f "$plist" \ - -c "ZoiteChat IRC client" \ -d "$desc" \ - "$work/${pkg_name}.tgz" + -D "COMMENT=ZoiteChat IRC client" \ + -D "FULLPKGPATH=net/zoitechat" \ + "$pkg_file" mkdir -p "$GITHUB_WORKSPACE/artifacts" - cp "$work/${pkg_name}.tgz" "$GITHUB_WORKSPACE/artifacts/" + cp "$work/$pkg_file" "$GITHUB_WORKSPACE/artifacts/" - name: Upload OpenBSD package uses: actions/upload-artifact@v4