Stop calling setup.py directly

This commit is contained in:
Micah Lee 2023-09-11 12:53:51 -07:00
parent 220a24548a
commit 9f616efdc1
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 3 additions and 3 deletions

View File

@ -122,7 +122,7 @@ In `flatpak/org.onionshare.OnionShare.yaml`:
Now, merge `onionshare-desktop.yaml` and `onionshare-cli.yaml` into the Flatpak manifest. Now, merge `onionshare-desktop.yaml` and `onionshare-cli.yaml` into the Flatpak manifest.
- [ ] Build and test the Flatpak package to ensure it works: - [ ] Build and test the Flatpak package to ensure it works:
```sh ```sh
flatpak-builder build --force-clean --jobs=$(nproc) --install-deps-from=flathub --install --user org.onionshare.OnionShare.yaml flatpak-builder build --force-clean --jobs=$(nproc) --install-deps-from=flathub --install --user flatpak/org.onionshare.OnionShare.yaml
flatpak run org.onionshare.OnionShare flatpak run org.onionshare.OnionShare
``` ```

View File

@ -302,7 +302,7 @@ modules:
ensure-writable: ensure-writable:
- easy-install.pth - easy-install.pth
build-commands: build-commands:
- cd desktop && python3 setup.py install --prefix=${FLATPAK_DEST} - cd desktop && pip3 install --prefix=${FLATPAK_DEST} .
- cd desktop && install -D -m0644 org.onionshare.OnionShare.appdata.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.appdata.xml - cd desktop && install -D -m0644 org.onionshare.OnionShare.appdata.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.appdata.xml
- cd desktop && install -D -m0644 org.onionshare.OnionShare.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/org.onionshare.OnionShare.svg - cd desktop && install -D -m0644 org.onionshare.OnionShare.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/org.onionshare.OnionShare.svg
- cd desktop && install -D -m0644 org.onionshare.OnionShare.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop - cd desktop && install -D -m0644 org.onionshare.OnionShare.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop
@ -356,7 +356,7 @@ modules:
- name: onionshare-cli - name: onionshare-cli
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- cd cli && python3 setup.py install --prefix=${FLATPAK_DEST} - cd cli && pip3 install --prefix=${FLATPAK_DEST} --no-deps .
sources: sources:
- type: dir - type: dir
path: .. path: ..