diff --git a/.DS_Store b/.DS_Store index 50a2133..5bb8766 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index c85345c..11f97c4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ dist/ # Snap and Flatpak local build output /snap -/su.reya.signed.json +/info.reya.signed.json /linux-artifacts # Vendored dependencies + cargo config generated by script/prepare-flathub diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index 2925f8d..a380bdf 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -12,7 +12,7 @@ path = "src/main.rs" name = "Signed" product-name = "Signed" description = "Nostr Git client for browsing repositories and collaborating" -identifier = "su.reya.signed" +identifier = "info.reya.signed" category = "DeveloperTool" version = "0.1.0-alpha" out-dir = "../dist" diff --git a/desktop/resources/icon.png b/desktop/resources/icon.png index 0004645..b383ccc 100644 Binary files a/desktop/resources/icon.png and b/desktop/resources/icon.png differ diff --git a/desktop/resources/snap/snapcraft.yaml.in b/desktop/resources/snap/snapcraft.yaml.in index 00378fd..9b125d6 100644 --- a/desktop/resources/snap/snapcraft.yaml.in +++ b/desktop/resources/snap/snapcraft.yaml.in @@ -54,4 +54,4 @@ parts: apps: signed: command: usr/bin/signed - common-id: su.reya.signed + common-id: info.reya.signed diff --git a/desktop/src/main.rs b/desktop/src/main.rs index 0270973..18f085c 100644 --- a/desktop/src/main.rs +++ b/desktop/src/main.rs @@ -78,7 +78,7 @@ fn main() { cx, ); - cx.set_app_identity("su.reya.signed", "Signed"); + cx.set_app_identity("info.reya.signed", "Signed"); let bounds = Bounds::centered(None, size(px(1120.0), px(750.0)), cx); let opts = WindowOptions { diff --git a/flathub/.gitignore b/flathub/.gitignore index cf6ea3c..e5e98a0 100644 --- a/flathub/.gitignore +++ b/flathub/.gitignore @@ -2,8 +2,8 @@ # These are generated by script/prepare-flathub vendor/ vendor.tar.gz -su.reya.signed.yml -su.reya.signed.metainfo.xml +info.reya.signed.yml +info.reya.signed.metainfo.xml release-info.xml cargo-config.toml build/ diff --git a/flathub/README.md b/flathub/README.md index 12a2fb9..bc48195 100644 --- a/flathub/README.md +++ b/flathub/README.md @@ -19,14 +19,14 @@ Run the preparation script from the repo root: This will: 1. Vendor all Rust dependencies (crates.io + git) 2. Generate the metainfo.xml with proper release info -3. Create `su.reya.signed.yml` - the Flatpak manifest for Flathub +3. Create `info.reya.signed.yml` - the Flatpak manifest for Flathub ## Files Generated | File | Purpose | |------|---------| -| `su.reya.signed.yml` | Main Flatpak manifest (submit this to Flathub) | -| `su.reya.signed.metainfo.xml` | AppStream metadata with release info | +| `info.reya.signed.yml` | Main Flatpak manifest (submit this to Flathub) | +| `info.reya.signed.metainfo.xml` | AppStream metadata with release info | | `vendor.tar.gz` | Vendored Rust dependencies | | `cargo-config.toml` | Cargo configuration for offline builds | | `release-info.xml` | Release info snippet for metainfo | @@ -39,13 +39,13 @@ Before submitting to Flathub, test the build: cd flathub # Build and install locally -flatpak-builder --user --install --force-clean build su.reya.signed.yml +flatpak-builder --user --install --force-clean build info.reya.signed.yml # Test the app -flatpak run su.reya.signed +flatpak run info.reya.signed # Run the Flathub linter (must pass!) -flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest su.reya.signed.yml +flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest info.reya.signed.yml flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo ``` @@ -69,15 +69,15 @@ git clone --branch=new-pr git@github.com:YOUR_USERNAME/flathub.git cd flathub # Create a new branch -git checkout -b su.reya.signed +git checkout -b info.reya.signed # Copy ONLY the manifest file from your project -cp /path/to/signed/flathub/su.reya.signed.yml . +cp /path/to/signed/flathub/info.reya.signed.yml . # Commit and push -git add su.reya.signed.yml -git commit -m "Add su.reya.signed" -git push origin su.reya.signed +git add info.reya.signed.yml +git commit -m "Add info.reya.signed" +git push origin info.reya.signed ``` ### 3. Open Pull Request @@ -92,9 +92,9 @@ git push origin su.reya.signed 1. Flathub's automated CI will build your app 2. A maintainer will review your submission -3. Once approved, a new repo `flathub/su.reya.signed` will be created +3. Once approved, a new repo `flathub/info.reya.signed` will be created 4. You'll get write access to maintain the app -5. Future updates: Push new commits to `flathub/su.reya.signed` +5. Future updates: Push new commits to `flathub/info.reya.signed` ## Updating the App @@ -104,9 +104,9 @@ To release a new version: 2. Tag the new release: `git tag -a v0.1.0 -m "Release v0.1.0"` 3. Push the tag: `git push origin v0.1.0` 4. Run `./script/prepare-flathub` to regenerate -5. Clone the flathub repo: `git clone https://github.com/flathub/su.reya.signed.git` +5. Clone the flathub repo: `git clone https://github.com/flathub/info.reya.signed.git` 6. Update the manifest with new commit/tag and hashes -7. Submit PR to `flathub/su.reya.signed` +7. Submit PR to `flathub/info.reya.signed` ## Troubleshooting @@ -115,7 +115,7 @@ To release a new version: - Ensure `vendor.tar.gz` is properly extracted before building ### Linter complains about metainfo -- Ensure `su.reya.signed.metainfo.xml` has at least one `` entry +- Ensure `info.reya.signed.metainfo.xml` has at least one `` entry - Add accessible screenshot URLs if required ### Missing dependencies diff --git a/script/flatpak/bundle-flatpak b/script/flatpak/bundle-flatpak index 1f4d369..52b7cba 100755 --- a/script/flatpak/bundle-flatpak +++ b/script/flatpak/bundle-flatpak @@ -16,7 +16,7 @@ archive_match="signed(-[a-zA-Z0-9]+)?-linux-${ARCH_SUFFIX}\.tar\.gz" archive=$(ls "target/release" | grep -E ${archive_match}) export ARCHIVE="$archive" -export APP_ID="su.reya.signed" +export APP_ID="info.reya.signed" export APP_NAME="Signed" export BRANDING_LIGHT="#C6FF4D" export BRANDING_DARK="#C6FF4D" diff --git a/script/prepare-flathub b/script/prepare-flathub index 538f500..e6d0a34 100755 --- a/script/prepare-flathub +++ b/script/prepare-flathub @@ -4,7 +4,7 @@ # This script: # 1. Vendors all Rust dependencies (crates.io + git) # 2. Generates release info for metainfo.xml -# 3. Creates the Flathub manifest (su.reya.signed.yml) +# 3. Creates the Flathub manifest (info.reya.signed.yml) # # Usage: ./script/prepare-flathub [--release-date YYYY-MM-DD] @@ -12,7 +12,7 @@ set -euo pipefail cd "$(dirname "$0")/.." # Configuration -APP_ID="su.reya.signed" +APP_ID="info.reya.signed" APP_NAME="Signed" REPO_URL="https://git.reya.su/reya/signed" BRANDING_LIGHT="#C6FF4D" @@ -106,7 +106,7 @@ COMMIT=$(git rev-parse HEAD) # Generate the YAML manifest cat > flathub/${APP_ID}.yml << 'MANIFEST_EOF' -id: su.reya.signed +id: info.reya.signed runtime: org.freedesktop.Platform runtime-version: "24.08" sdk: org.freedesktop.Sdk @@ -153,22 +153,22 @@ modules: - install -Dm755 target/release/signed /app/bin/signed # Install icons - - install -Dm644 desktop/resources/icon.png /app/share/icons/hicolor/512x512/apps/su.reya.signed.png - - install -Dm644 desktop/resources/icon@2x.png /app/share/icons/hicolor/1024x1024/apps/su.reya.signed.png + - install -Dm644 desktop/resources/icon.png /app/share/icons/hicolor/512x512/apps/info.reya.signed.png + - install -Dm644 desktop/resources/icon@2x.png /app/share/icons/hicolor/1024x1024/apps/info.reya.signed.png # Install desktop file - | - export APP_ID="su.reya.signed" - export APP_ICON="su.reya.signed" + export APP_ID="info.reya.signed" + export APP_ICON="info.reya.signed" export APP_NAME="Signed" export APP_CLI="signed" export APP_ARGS="%U" export DO_STARTUP_NOTIFY="true" envsubst < desktop/resources/signed.desktop.in > signed.desktop - install -Dm644 signed.desktop /app/share/applications/su.reya.signed.desktop + install -Dm644 signed.desktop /app/share/applications/info.reya.signed.desktop # Install metainfo (use pre-generated one with release info) - - install -Dm644 su.reya.signed.metainfo.xml /app/share/metainfo/su.reya.signed.metainfo.xml + - install -Dm644 info.reya.signed.metainfo.xml /app/share/metainfo/info.reya.signed.metainfo.xml sources: # Main source code - specific commit @@ -184,7 +184,7 @@ modules: # Pre-generated metainfo with release info - type: file - path: su.reya.signed.metainfo.xml + path: info.reya.signed.metainfo.xml sha256: "@METAINFO_SHA256@" # Cargo config for vendoring