diff --git a/flatpak/pandoc-download b/flatpak/pandoc-download index fd861f8..a633463 100755 --- a/flatpak/pandoc-download +++ b/flatpak/pandoc-download @@ -28,6 +28,7 @@ install: tar xf data.tar.* cp ./usr/bin/pandoc /app/bin/pandoc cp ./usr/bin/pandoc-citeproc /app/bin/pandoc-citeproc + mkdir -p /app/share/ cp ./usr/share/doc/pandoc/copyright /app/share/pandoc.copyright cd .. rm -rf /tmp/pandoc_dl diff --git a/flatpak/uberwriter.json b/flatpak/uberwriter.json index 06723f9..f4e644f 100644 --- a/flatpak/uberwriter.json +++ b/flatpak/uberwriter.json @@ -13,7 +13,8 @@ ], "build-options" : { "env": { - "PYTHON": "python3" + "PYTHON": "python3", + "IN_FLATPAK": "1" } }, "modules": [ @@ -22,7 +23,7 @@ "sources": [ { "type": "git", - "url": "git://github.com/wolfv/uberwriter", + "url": "file://home/wolfv/Programs/uberwriter", "branch": "master" } ] diff --git a/setup.py b/setup.py index c82e716..7f49e00 100644 --- a/setup.py +++ b/setup.py @@ -35,6 +35,11 @@ from pprint import pprint pprint(extra_files_ui) pprint(extra_files_media) +if os.environ.get('IN_FLATPAK'): + app_prefix = '/app/' +else: + app_prefix = '' + setup( name='uberwriter', version='1.0', @@ -69,11 +74,11 @@ setup( 'uberwriter_lib.pylocales' : ['locales.db'], }, data_files=[ - ('bin/', ['bin/uberwriter']), - ('share/glib-2.0/schemas', ['data/glib-2.0/schemas/net.launchpad.uberwriter.gschema.xml']), - ('share/icons/hicolor/scalable/apps', ['data/media/uberwriter.svg']), - ('share/applications', ['de.wolfvollprecht.UberWriter.desktop']), - ('opt/uberwriter/data/ui', extra_files_ui), - ('opt/uberwriter/data/media', extra_files_media) + (app_prefix + '/bin/', ['bin/uberwriter']), + (app_prefix + '/share/glib-2.0/schemas', ['data/glib-2.0/schemas/net.launchpad.uberwriter.gschema.xml']), + (app_prefix + '/share/icons/hicolor/scalable/apps', ['data/media/uberwriter.svg']), + (app_prefix + '/share/applications', ['de.wolfvollprecht.UberWriter.desktop']), + (app_prefix + '/opt/uberwriter/data/ui', extra_files_ui), + (app_prefix + '/opt/uberwriter/data/media', extra_files_media) ] )