diff --git a/appimage.yml b/appimage.yml index 366aa128..8e7a3b5c 100644 --- a/appimage.yml +++ b/appimage.yml @@ -3,14 +3,13 @@ version: 1 script: - rm -rf AppDir || true - cp -r build/linux/x64/release/bundle AppDir - - mkdir -p AppDir/usr/share/icons/hicolor/64x64/apps/ - - cp assets/icons/64.png AppDir/usr/share/icons/hicolor/64x64/apps/selfprivacy.png + - install -Dm644 assets/images/icon/logo.svg AppDir/usr/share/icons/hicolor/scalable/apps/pro.kherel.selfprivacy.svg AppDir: path: AppDir app_info: id: pro.kherel.selfprivacy name: SelfPrivacy - icon: selfprivacy.png + icon: pro.kherel.selfprivacy version: 0.6.0 exec: selfprivacy exec_args: $@ diff --git a/assets/icons/128.png b/assets/icons/128.png deleted file mode 100644 index f9e29ce9..00000000 Binary files a/assets/icons/128.png and /dev/null differ diff --git a/assets/icons/16.png b/assets/icons/16.png deleted file mode 100644 index 00f7e7d6..00000000 Binary files a/assets/icons/16.png and /dev/null differ diff --git a/assets/icons/256.png b/assets/icons/256.png deleted file mode 100644 index 75dfc6cd..00000000 Binary files a/assets/icons/256.png and /dev/null differ diff --git a/assets/icons/32.png b/assets/icons/32.png deleted file mode 100644 index 5e1b59d8..00000000 Binary files a/assets/icons/32.png and /dev/null differ diff --git a/assets/icons/512.png b/assets/icons/512.png deleted file mode 100644 index da350201..00000000 Binary files a/assets/icons/512.png and /dev/null differ diff --git a/assets/icons/64.png b/assets/icons/64.png deleted file mode 100644 index b79e1fb3..00000000 Binary files a/assets/icons/64.png and /dev/null differ diff --git a/assets/images/icon/logo.svg b/assets/images/icon/logo.svg new file mode 100644 index 00000000..881a57fe --- /dev/null +++ b/assets/images/icon/logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ci.py b/ci.py index bf1e42e7..d8412580 100755 --- a/ci.py +++ b/ci.py @@ -105,15 +105,15 @@ def run_ci_build(): if __name__ == "__main__": parser = argparse.ArgumentParser() group = parser.add_mutually_exclusive_group() - group.add_argument("--build-linux", action="store_true") - group.add_argument("--build-apk", action="store_true") - group.add_argument("--sign-apk-standalone", action="store_true") - group.add_argument("--sign-apk-fdroid", action="store_true") + group.add_argument("--build-linux", action="store_true", help="depends on podman src volume") + group.add_argument("--build-apk", action="store_true", help="depends on podman src volume") + group.add_argument("--sign-apk-standalone", action="store_true", help="depends on $STANDALONE_KEYSTORE_PASS") + group.add_argument("--sign-apk-fdroid", action="store_true", help="depends on $FDROID_KEYSTORE_PASS") group.add_argument("--package-linux-appimage", action="store_true") group.add_argument("--package-linux-flatpak", action="store_true") group.add_argument("--package-linux-archive", action="store_true") - group.add_argument("--deploy-gitea-release", action="store_true") - group.add_argument("--deploy-fdroid-repo", action="store_true") + group.add_argument("--deploy-gitea-release", action="store_true", help="depends on $GITEA_RELEASE_TOKEN") + group.add_argument("--deploy-fdroid-repo", action="store_true", help="depends on $SSH_PRIVATE_KEY") group.add_argument("--run-ci-build", action="store_true") args = parser.parse_args() diff --git a/flatpak.yml b/flatpak.yml index 23a84f73..6808b84e 100644 --- a/flatpak.yml +++ b/flatpak.yml @@ -17,9 +17,15 @@ modules: - cp -r * /app - mkdir /app/bin - ln -s /app/selfprivacy /app/bin/selfprivacy + - install -Dm644 logo.svg /app/share/icons/hicolor/scalable/apps/pro.kherel.selfprivacy.svg + - install -Dm644 pro.kherel.selfprivacy.desktop /app/share/applications/pro.kherel.selfprivacy.desktop sources: - type: dir path: build/linux/x64/release/bundle + - type: file + path: assets/images/icon/logo.svg + - type: file + path: pro.kherel.selfprivacy.desktop - name: libsecret buildsystem: meson config-opts: