Merge pull request #3 from 5cript/release/v0.1.0

Release/v0.1.1

Author: 5cript

.github/workflows/flatpak.yml

@@ -52,26 +52,26 @@ jobs:
 
       - name: Rename flatpak bundle
         run: |
-          mv nui-sftp.flatpak "nui-sftp-flatpak-x86_64_${{ env.VERSION }}.zip"
+          mv nui-sftp.flatpak "nui-sftp-flatpak-x86_64_${{ env.VERSION }}.flatpak"
 
       - name: Upload Artifact to Release
         if: github.ref == 'refs/heads/main'
         env:
           GH_TOKEN: ${{ secrets.RELEASEUPLOADPAT }}
         run: |
-          gh release upload "v${{ env.VERSION }}" "nui-sftp-flatpak-x86_64_${{ env.VERSION }}.zip" --repo 5cript/nui-sftp
+          gh release upload "v${{ env.VERSION }}" "nui-sftp-flatpak-x86_64_${{ env.VERSION }}.flatpak" --repo 5cript/nui-sftp
 
       - name: Upload artifacts to MEGA S4
         if: github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch'
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.MEGAS4ACCESS }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.MEGAS4KEY }}
           ENDPOINT: https://s3.eu-central-1.s4.mega.io
-          FILENAME: "nui-sftp-flatpak-x86_64_${{ env.VERSION }}.zip"
+          FILENAME: "nui-sftp-flatpak-x86_64_${{ env.VERSION }}.flatpak"
           S3_PATH: "s3://nui-sftp-releases/flatpak/${{ (github.event_name == 'workflow_dispatch' && 'x86_64/user_trigger') || 'x86_64' }}/"
         run: |
           # 1. Check if the file exists on the remote S4 storage
-          # We point to the full URI: s3://bucket/path/filename.zip
+          # We point to the full URI: s3://bucket/path/filename.flatpak
           if aws s3 ls "${{ env.S3_PATH }}${{ env.FILENAME }}" --endpoint-url ${{ env.ENDPOINT }} > /dev/null 2>&1; then
             echo "::error::Deployment failed: ${{ env.FILENAME }} already exists in S4. Aborting to prevent overwrite."
             exit 1

.github/workflows/windows.yml

@@ -130,7 +130,7 @@ jobs:
           path: ${{ env.WSPACE }}/nui-sftp-windows-x86_64_${{ env.VERSION }}.zip
 
       - name: Upload Artifact to Release
-        # if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/main'
         env:
           GH_TOKEN: ${{ secrets.RELEASEUPLOADPAT }}
         run: |

PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Tim Ebbeke <tim 06 tr (at) gmail dot com>
 
 pkgname=nui-sftp
-pkgver=0.0.5
+pkgver=0.1.1
 pkgrel=1
 pkgdesc="NUI-based SFTP application"
 arch=('x86_64')
@@ -28,25 +28,23 @@ makedepends=(
 options=('!debug')
 source=(
     "$pkgname::git+$url.git#tag=v${pkgver//_/-}"
-    "git+https://github.com/NuiCpp/Nui.git#commit=d066aebccc5ef40612e4c072ad14686ca8c16072"
+    "git+https://github.com/NuiCpp/Nui.git#tag=v3.0.0"
     "git+https://github.com/5cript/roar.git#commit=a787bce9c8132f4c860bc9e55bff742fd1a3276f"
     "git+https://github.com/DNKpp/gimo.git#commit=16377a6d496b31a9272f9a079c060fba15258bcc"
     "git+https://github.com/NuiCpp/traits.git#commit=6c9caa21c48c9e1f7f039a7bdf8805a0940fce0a"
-    "git+https://github.com/NuiCpp/ui5.git#commit=a514318f9110f7e77574abd283ef0c5ecf634f40"
-    "git+https://github.com/5cript/5cript-nui-components.git#commit=fb33b5f751eed174b930329fbecf52138e63c0cf"
+    "git+https://github.com/5cript/5cript-nui-components.git#commit=755a0246a961619e4372caf24e0b499b4856d4dd"
     "https://s3.g.s4.mega.io/jgemkib4a5fte35rktt5wxrwkw4ejk4ybemkf/nui-scp/images/NUI-SFTP_Logo-01.svg"
     "https://github.com/5cript/nui-sftp/releases/download/v${pkgver}/nui-sftp-linux-frontend_${pkgver}.tar.gz"
 )
 sha256sums=(
-    '6fc3bea15d2c08b6ac902a647102b178665c67e680e2fdb5f3f3e81fe531ba70'
-    '06bb027424dee282a5d9806b6a9ffec4be6084790a6312120174244b27610299'
+    'd7e95006e01d0aa72f72ff1cc9d4741d21801f47c1a09584c0419a4cfd0e9103'
+    '7948c9f043d8ebd34b9fbc1b5c2214c59fe919b102ea699a1714abb904b01124'
     '411be282af945718509ce24cc0c2ef837657398c23386a0cb7035d1ecc6367d5'
     '8d5c5f36710425e8660470db14a5d6011e20b4e9be638f3ab34ad81f9fe286b7'
     '77bed25f96135cdcf1b8274664c9564375f9823866e7d55e843f75a213af5359'
-    '64e6a4c24ef2e229721482448f8b139c50c41bbdecaea4cf79ce079a8d21e4a0'
-    'b48e921daff6efe9b9ce1520ae9ee431c0f8ed6428d8190cd33750df8049398a'
+    'b2c3cf89924b49a3d4106c49fe8123cef784acfec9189102c0a26cd5b2585559'
     '6a8217c9f00ded6893324649394a9dbc9e5004a2644735fd3f18934bb29bcae6'
-    '7d97c50cac458a9dcfab1ef4d6b8288df4c72f7eb52f59fc3b46a45702c7107c'
+    '3808896fed768382e424d7058f2ff99e1728cd73aece2980ba3ba763bc1738f0'
 )
 
 build() {
@@ -59,7 +57,6 @@ build() {
     cp -r "$srcdir/roar" "$srcdir/$pkgname/dependencies/roar"
     cp -r "$srcdir/gimo" "$srcdir/$pkgname/dependencies/gimo"
     cp -r "$srcdir/traits" "$srcdir/$pkgname/dependencies/traits"
-    cp -r "$srcdir/ui5" "$srcdir/$pkgname/dependencies/ui5"
     cp -r "$srcdir/5cript-nui-components" "$srcdir/$pkgname/dependencies/5cript-nui-components"
 
     cmake -B "$srcdir/$pkgname/build" \
@@ -84,8 +81,6 @@ package() {
     mkdir -p "$pkgdir"/opt/"$pkgname"/bin
     mkdir -p "$pkgdir"/opt/"$pkgname"/frontend
     mkdir -p "$pkgdir"/opt/"$pkgname"/assets
-    mkdir -p "$pkgdir"/opt/"$pkgname"/themes
-    mkdir -p "$pkgdir"/opt/"$pkgname"/themes/dark
 
     # Unpack frontend tarball
     tar -xzf "$srcdir/nui-sftp-linux-frontend_${pkgver//_/-}.tar.gz" -C "$pkgdir"/opt/"$pkgname"/frontend --strip-components=1
@@ -94,7 +89,6 @@ package() {
     install -m755 "$srcdir/$pkgname/build/bin/$pkgname" "$pkgdir"/opt/"$pkgname"/bin/"$pkgname"
     cp -r "$srcdir/$pkgname/build/assets" "$pkgdir"/opt/"$pkgname"/
     install -m644 "$srcdir/$pkgname/LICENSE" "$pkgdir"/opt/"$pkgname"/LICENSE
-    install -m644 "$srcdir/$pkgname/build/themes/dark/css_variables.css" "$pkgdir"/opt/"$pkgname"/themes/dark/css_variables.css
 
     # Desktop
     install -Dm644 "$srcdir/$pkgname/org.nuicpp.nui_sftp.desktop" "$pkgdir"/usr/share/applications/"$pkgname".desktop

org.nuicpp.nui_sftp.metainfo.xml

@@ -20,6 +20,25 @@
         </screenshot>
     </screenshots>
     <releases>
+        <release version="v0.1.1" date="2026-03-22">
+            <description>
+                <h2 id="whatchanged">What changed</h2>
+                <p>There are no more ui5 themes to deploy, so they were removed from deploy.sh</p>
+            </description>
+        </release>
+        <release version="v0.1.0" date="2026-03-22">
+            <description>
+                <h2 id="whatschanged">What&apos;s Changed</h2>
+                <ul>
+                    <li>Remove ui5 webcomponents by @5cript in https://github.com/5cript/nui-sftp/pull/28</li>
+                </ul>
+                <p>
+                    
+                    <strong>Full Changelog</strong>
+                    : https://github.com/5cript/nui-sftp/compare/v0.0.5…v0.1.0
+                </p>
+            </description>
+        </release>
         <release version="v0.0.5" date="2026-03-11">
             <description>
                 <p>Fixed Frontend Artifact Upload</p>

org.nuicpp.nui_sftp.yml

@@ -124,7 +124,7 @@ modules:
           -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
           -DOFFLINE_BUILD=ON
           -DJSON_Diagnostics=ON
-          -DFORCED_PROJECT_VERSION=v0.0.5
+          -DFORCED_PROJECT_VERSION=0.1.1
       - cmake --build build/flatpak
       - OMIT_FRONTEND=true ./scripts/deploy.sh
       # Patch desktop file to rename icon "nui_sftp.svg" to "org.nuicpp.nui_sftp.svg"
@@ -138,10 +138,10 @@ modules:
     sources:
       - type: git
         url: https://github.com/5cript/nui-sftp
-        tag: v0.0.5
+        tag: v0.1.1
       - type: git
         url: https://github.com/NuiCpp/Nui.git
-        commit: d066aebccc5ef40612e4c072ad14686ca8c16072
+        tag: v3.0.0
         dest: 'dependencies/Nui'
       - type: git
         url: https://github.com/5cript/roar.git

scripts/update_scripts/flatpak.mjs

@@ -1,5 +1,5 @@
 import { flatpakYamlPath } from './files_and_dirs.mjs';
-import { version } from './args.mjs';
+import { parsedVersion } from './version.mjs';
 import { findLineIndexMatching, onLineMatchingModify, splitLines } from './text_editing.mjs';
 import { workDependenciesAsMap } from './work_dependencies.mjs';
 import { looksLikeGitHash } from './git.mjs';
@@ -14,14 +14,14 @@ async function setFunctionOnForcedVersionCmakeOptions(yamlLines) {
     }
 
     const cmakeOptionsLine = yamlLines[lineIndex];
-    yamlLines[lineIndex] = match[1] + `-DFORCED_PROJECT_VERSION=${version}`;
+    yamlLines[lineIndex] = match[1] + `-DFORCED_PROJECT_VERSION=${parsedVersion().majorMinorPatch}`;
     console.log(`Updating DFORCED_PROJECT_VERSION in flatpak YAML from ${cmakeOptionsLine} to ${yamlLines[lineIndex]}...`);
     return yamlLines;
 }
 
 async function updateSources(yamlLines) {
     const workDeps = await workDependenciesAsMap();
-    workDeps['nui-sftp'] = { url: 'https://github.com/5cript/nui-sftp', rev: version, branch: 'main' };
+    workDeps['nui-sftp'] = { url: 'https://github.com/5cript/nui-sftp', rev: parsedVersion().tag, branch: 'main' };
     for (const [name, { url, rev }] of Object.entries(workDeps)) {
         // find url in yaml lines
         const urlLineIndex = findLineIndexMatching(yamlLines, new RegExp(`\\s*url:\\s*${url.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`)).lineIndex;
@@ -32,8 +32,8 @@ async function updateSources(yamlLines) {
 
         // Search two lines up and below for "tag" or "commit":
         let refLineIndex = -1;
-        const checkFrom = Math.max(0, urlLineIndex - 2);
-        const checkTo = Math.min(yamlLines.length - 1, urlLineIndex + 2);
+        const checkFrom = Math.max(0, urlLineIndex);
+        const checkTo = Math.min(yamlLines.length - 1, urlLineIndex + 3);
         for (let i = checkFrom; i <= checkTo; ++i) {
             if (/^\s*(tag|commit):\s*v?.*/.test(yamlLines[i])) {
                 refLineIndex = i;
@@ -53,9 +53,9 @@ async function updateSources(yamlLines) {
         console.log(`Updating source for work dependency ${name} in flatpak YAML from ${refType} ${yamlLines[refLineIndex]} to ${refType} ${newRefValue}...`);
 
         if (looksLikeGitHash(newRefValue)) {
-            yamlLines[refLineIndex] = yamlLines[refLineIndex].replace(/^\s*tag:\s*v?.*/, `${refLineSpacePrefix}commit: ${newRefValue}`);
+            yamlLines[refLineIndex] = refLineSpacePrefix + `commit: ${newRefValue}`;
         } else {
-            yamlLines[refLineIndex] = yamlLines[refLineIndex].replace(/^\s*commit:\s*v?.*/, `${refLineSpacePrefix}tag: ${newRefValue}`);
+            yamlLines[refLineIndex] = refLineSpacePrefix + `tag: ${newRefValue}`; // Assuming it's a tag if it doesn't look like a git hash
         }
     }
     return yamlLines;