aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2023-09-11 12:53:51 -0700
committerMicah Lee <micah@micahflee.com>2023-09-11 12:53:51 -0700
commit9f616efdc1abf2aeefb8b8c4dee2ed40d984e8aa (patch)
treefd2f17d1e7a8ea58abec84d473b07e96fa6aeec7
parent220a24548a73b2eca6fef34654cf4ddd07a8fe2f (diff)
downloadonionshare-9f616efdc1abf2aeefb8b8c4dee2ed40d984e8aa.tar.gz
onionshare-9f616efdc1abf2aeefb8b8c4dee2ed40d984e8aa.zip
Stop calling setup.py directly
-rw-r--r--RELEASE.md2
-rw-r--r--flatpak/org.onionshare.OnionShare.yaml4
2 files changed, 3 insertions, 3 deletions
diff --git a/RELEASE.md b/RELEASE.md
index 98376a7f..81480ed1 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -122,7 +122,7 @@ In `flatpak/org.onionshare.OnionShare.yaml`:
Now, merge `onionshare-desktop.yaml` and `onionshare-cli.yaml` into the Flatpak manifest.
- [ ] Build and test the Flatpak package to ensure it works:
```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
```
diff --git a/flatpak/org.onionshare.OnionShare.yaml b/flatpak/org.onionshare.OnionShare.yaml
index e15bd7b6..8f72cdab 100644
--- a/flatpak/org.onionshare.OnionShare.yaml
+++ b/flatpak/org.onionshare.OnionShare.yaml
@@ -302,7 +302,7 @@ modules:
ensure-writable:
- easy-install.pth
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.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
@@ -356,7 +356,7 @@ modules:
- name: onionshare-cli
buildsystem: simple
build-commands:
- - cd cli && python3 setup.py install --prefix=${FLATPAK_DEST}
+ - cd cli && pip3 install --prefix=${FLATPAK_DEST} --no-deps .
sources:
- type: dir
path: ..