From e761454d9a6d1982c142b61a36c7dde0c3d8a3fa Mon Sep 17 00:00:00 2001 From: 5cript Date: Sat, 16 May 2026 15:40:08 +0200 Subject: [PATCH 1/3] Fixed release notes script to adhere flatpak lint. --- org.nuicpp.nui_sftp.metainfo.xml | 40 +++++++++++++++++++---------- scripts/update_scripts/metainfo.mjs | 30 ++++++++++++++++++++++ 2 files changed, 57 insertions(+), 13 deletions(-) diff --git a/org.nuicpp.nui_sftp.metainfo.xml b/org.nuicpp.nui_sftp.metainfo.xml index 7aed1f7..b13a60f 100644 --- a/org.nuicpp.nui_sftp.metainfo.xml +++ b/org.nuicpp.nui_sftp.metainfo.xml @@ -36,6 +36,20 @@ + + +

What's Changed

+
    +
  • Feat/docs flatpak update by @5cript in https://github.com/5cript/nui-sftp/pull/167
    • +
  • Fixed reconnect multi terminal restore. by @5cript in https://github.com/5cript/nui-sftp/pull/168
    • +
+

+ + Full Changelog + : https://github.com/5cript/nui-sftp/compare/v1.1.0…v1.1.1 +

+ +

What's Changed

@@ -44,7 +58,7 @@
  • Onboarding Flow by @5cript in https://github.com/5cript/nui-sftp/pull/165

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v1.0.2…v1.1.0

    @@ -58,7 +72,7 @@
  • Added mention of AppImage to Readme and WebPage. by @5cript in https://github.com/5cript/nui-sftp/pull/163

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v1.0.1…v1.0.2

    @@ -72,7 +86,7 @@
  • Ssh Processing Thread Crash Fix by @5cript in https://github.com/5cript/nui-sftp/pull/160

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v1.0.0…v1.0.1

    @@ -86,7 +100,7 @@
  • Add WebPage by @5cript in https://github.com/5cript/nui-sftp/pull/152

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v0.10.3…v1.0.0

    @@ -100,7 +114,7 @@
  • Removed sdbus++ leftovers. by @5cript in https://github.com/5cript/nui-sftp/pull/147

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v0.10.2…v0.10.3

    @@ -113,7 +127,7 @@
  • Fix Portal, Remote Favorites and Renaming by @5cript in https://github.com/5cript/nui-sftp/pull/144

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v0.10.1…v0.10.2

    @@ -137,7 +151,7 @@
  • Fixed version regex. by @5cript in https://github.com/5cript/nui-sftp/pull/139

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v0.9.0…v0.10.0

    @@ -181,7 +195,7 @@
  • Places Panel for File Grid by @5cript in https://github.com/5cript/nui-sftp/pull/103

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v0.7.1…v0.8.0

    @@ -207,7 +221,7 @@
  • Feat/asset finder improvements by @5cript in https://github.com/5cript/nui-sftp/pull/87

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v0.6.0…v0.6.1

    @@ -268,7 +282,7 @@
  • Updated components. by @5cript in https://github.com/5cript/nui-sftp/pull/34

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v0.3.0…v0.3.1

    @@ -286,7 +300,7 @@
  • File Grid Improvements & Bug Fixes by @5cript in https://github.com/5cript/nui-sftp/pull/32

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v0.1.1…v0.2.0

    @@ -305,7 +319,7 @@
  • Remove ui5 webcomponents by @5cript in https://github.com/5cript/nui-sftp/pull/28

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v0.0.5…v0.1.0

    @@ -328,7 +342,7 @@
  • Several Changes for Package Builds by @5cript in https://github.com/5cript/nui-sftp/pull/21

    • - + Full Changelog : https://github.com/5cript/nui-sftp/compare/v0.0.2-beta…v0.0.3-beta

    diff --git a/scripts/update_scripts/metainfo.mjs b/scripts/update_scripts/metainfo.mjs index 5888536..ff0046d 100644 --- a/scripts/update_scripts/metainfo.mjs +++ b/scripts/update_scripts/metainfo.mjs @@ -16,6 +16,35 @@ function convertReleaseToHtml(str) { return html; } +// AppStream only permits: p, ul, ol, li, em, code. +// Everything else (h1-h6, strong, b, i, a, ...) is rejected by the flatpak/appstream linter. +// showdown produces several of those from GitHub release markdown, so we rewrite the parsed +// tree before it gets serialised back into the metainfo XML. +const TAG_RENAMES = { + h1: 'p', h2: 'p', h3: 'p', h4: 'p', h5: 'p', h6: 'p', + strong: 'em', + b: 'em', + i: 'em', +}; + +function sanitizeAppStreamNodes(nodes) { + if (!Array.isArray(nodes)) return; + for (const node of nodes) { + const tag = Object.keys(node).find(k => k !== ':@'); + if (!tag || tag.startsWith('#') || tag === 'comment' || tag === 'cdata') continue; + + sanitizeAppStreamNodes(node[tag]); + + const renamed = TAG_RENAMES[tag]; + if (renamed) { + node[renamed] = node[tag]; + delete node[tag]; + //

    / don't accept the id attribute showdown adds to headings. + delete node[':@']; + } + } +} + function htmlToFastXmlFormat(html) { const parser = new XMLParser({ ignoreAttributes: false, @@ -29,6 +58,7 @@ function htmlToFastXmlFormat(html) { }); const parsed = parser.parse(html); + sanitizeAppStreamNodes(parsed); return parsed; } From 4a4a931968752aabf0c3320efdc3492891eb9c0b Mon Sep 17 00:00:00 2001 From: 5cript Date: Sat, 16 May 2026 15:42:10 +0200 Subject: [PATCH 2/3] Prepared 1.1.1 --- PKGBUILD | 6 +++--- org.nuicpp.nui_sftp.yml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 1030a09..6664036 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Tim Ebbeke pkgname=nui-sftp -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="NUI-based SFTP application" arch=('x86_64') @@ -39,9 +39,9 @@ source=( "https://s3.g.s4.mega.io/jgemkib4a5fte35rktt5wxrwkw4ejk4ybemkf/nui-scp/icons.tar.gz" ) sha256sums=( - 'fbef915d832c6fb9228e28fd45f6d9ac2939a21aaaef8f84718b58a04dd9d99d' + '9246f4da3d6b9f9d87fe57d2567e92f309f64a523604d89bf31edc794f597ee9' 'cf0fc442069dfd28bd8b7769da6dfdca92111044ea9817197716ed9bfada3869' - '9849abaa9889dfb1670a2498133b5fabc8bf010f72252325ba075c2614f392c8' + '1a967af0ab93e5bac67e79b93b0272f7b79b79de7e4ff46b967d9c09e581969e' '30ffa48c3a509e878db31a1e5d80376242852e34d9c2aa3b44d2e3d1da2ce32e' ) diff --git a/org.nuicpp.nui_sftp.yml b/org.nuicpp.nui_sftp.yml index e8c65a4..e595c15 100644 --- a/org.nuicpp.nui_sftp.yml +++ b/org.nuicpp.nui_sftp.yml @@ -70,8 +70,8 @@ modules: - cp -r * /app/frontend sources: - type: archive - url: https://github.com/5cript/nui-sftp/releases/download/v1.1.0/nui-sftp-linux-frontend_1.1.0.tar.gz - sha256: 9849abaa9889dfb1670a2498133b5fabc8bf010f72252325ba075c2614f392c8 + url: https://github.com/5cript/nui-sftp/releases/download/v1.1.1/nui-sftp-linux-frontend_1.1.1.tar.gz + sha256: 1a967af0ab93e5bac67e79b93b0272f7b79b79de7e4ff46b967d9c09e581969e - name: nui-sftp buildsystem: cmake-ninja @@ -116,8 +116,8 @@ modules: sources: - type: git url: https://github.com/5cript/nui-sftp - tag: v1.1.0 - commit: 6055e2749e77bb22bd70553fc433e013c75c7fd2 + tag: v1.1.1 + commit: 2e78074b4fd5a92a38b9901081c3e464c08b7238 - type: archive url: https://s3.g.s4.mega.io/jgemkib4a5fte35rktt5wxrwkw4ejk4ybemkf/nui-scp/icons.tar.gz sha256: 30ffa48c3a509e878db31a1e5d80376242852e34d9c2aa3b44d2e3d1da2ce32e @@ -125,8 +125,8 @@ modules: strip-components: 0 - type: git url: https://github.com/5cript/nui-sftp-deploy - tag: flatpak/1.1.0 - commit: c13519e3a3db11401bcd203b4cab8971ebb178dc + tag: flatpak/1.1.0_1 + commit: 8ff88536f0342261ee3bbab55d147ad4cfff80bd disable-submodules: true dest: deploy-meta - type: file From dd740b483436ebb93a96dc963dd14eb28eb6f38a Mon Sep 17 00:00:00 2001 From: 5cript Date: Sat, 16 May 2026 15:53:34 +0200 Subject: [PATCH 3/3] Added flathub repo as submodule to copy release. --- .gitmodules | 3 +++ flathub | 1 + scripts/copy_manifest_to_flathub.sh | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 160000 flathub create mode 100755 scripts/copy_manifest_to_flathub.sh diff --git a/.gitmodules b/.gitmodules index a60d6bd..755a7f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "arch"] path = arch url = https://aur.archlinux.org/nui-sftp.git +[submodule "flathub"] + path = flathub + url = git@github.com:flathub/org.nuicpp.nui_sftp.git diff --git a/flathub b/flathub new file mode 160000 index 0000000..5709989 --- /dev/null +++ b/flathub @@ -0,0 +1 @@ +Subproject commit 5709989e7a7dc2691677d11c25d8689ecf68a8b4 diff --git a/scripts/copy_manifest_to_flathub.sh b/scripts/copy_manifest_to_flathub.sh new file mode 100755 index 0000000..964fe95 --- /dev/null +++ b/scripts/copy_manifest_to_flathub.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e +set -u + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source "${SCRIPT_DIR}/lib.sh" + +SOURCE_DIR="${SOURCE_DIRECTORY:-${SCRIPT_DIR}/..}" +SOURCE_DIR=$(canonicalPath "${SOURCE_DIR}") + +MANIFEST="org.nuicpp.nui_sftp.yml" + +cp "${SOURCE_DIR}/${MANIFEST}" "${SOURCE_DIR}/flathub/${MANIFEST}" + +cd "${SOURCE_DIR}/flathub" + +VERSION=$("${SCRIPT_DIR}/extract_version.sh") + +git add "${MANIFEST}" +git commit -m "Update to ${VERSION}"