From 6cf52bd80807dfe251689fdb4bad3618f22a61de Mon Sep 17 00:00:00 2001 From: sezanzeb Date: Sun, 29 Nov 2020 13:30:16 +0100 Subject: [PATCH] debian package --- {deb/DEBIAN => DEBIAN}/control | 0 readme/coverage.svg | 6 +++--- badges.sh => scripts/badges.sh | 0 build.sh => scripts/build.sh | 8 ++++---- setup.py | 15 ++++----------- 5 files changed, 11 insertions(+), 18 deletions(-) rename {deb/DEBIAN => DEBIAN}/control (100%) rename badges.sh => scripts/badges.sh (100%) mode change 100644 => 100755 rename build.sh => scripts/build.sh (71%) diff --git a/deb/DEBIAN/control b/DEBIAN/control similarity index 100% rename from deb/DEBIAN/control rename to DEBIAN/control diff --git a/readme/coverage.svg b/readme/coverage.svg index 6963b3e1..dd6df127 100644 --- a/readme/coverage.svg +++ b/readme/coverage.svg @@ -9,13 +9,13 @@ - + coverage coverage - 87% - 87% + 61% + 61% diff --git a/badges.sh b/scripts/badges.sh old mode 100644 new mode 100755 similarity index 100% rename from badges.sh rename to scripts/badges.sh diff --git a/build.sh b/scripts/build.sh similarity index 71% rename from build.sh rename to scripts/build.sh index 4c97fdfd..acd2af92 100755 --- a/build.sh +++ b/scripts/build.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# builds .deb and .appimage files in order to distribute them build_deb() { # https://github.com/phusion/debian-packaging-for-the-modern-developer/tree/master/tutorial-1 @@ -8,15 +9,14 @@ build_deb() { python3 setup.py sdist --dist-dir $dist tar -C $dist -xzf $dist/$name.tar.gz rm $dist/$name.tar.gz - cp deb/DEBIAN $dist/$name -r + cp DEBIAN $dist/$name -r dpkg-deb -b $dist/$name $dist/$name.deb rm $dist/$name -r - cp $dist/$name.deb deb - echo ".deb package created" + echo "created $dist/$name.deb" } build_appimage() { - + echo "created $dist/$name.appimage" } diff --git a/setup.py b/setup.py index 14afb778..818bb5d8 100644 --- a/setup.py +++ b/setup.py @@ -22,9 +22,6 @@ import glob from setuptools import setup -with open('README.md', 'r') as f: - long_description = f.read() - setup( name='key-mapper', version='0.1.0', @@ -39,14 +36,10 @@ setup( 'keymapper.gtk' ], data_files=[ - ('share/key-mapper/', glob.glob('data/*')), - ('share/applications/', ['data/key-mapper.desktop']), + ('/usr/share/key-mapper/', glob.glob('data/*')), + ('/usr/share/applications/', ['data/key-mapper.desktop']), ('/etc/xdg/autostart/', ['data/key-mapper-service.desktop']), + ('/usr/bin/', ['bin/key-mapper-gtk']), + ('/usr/bin/', ['bin/key-mapper-service']), ], - scripts=[ - 'bin/key-mapper-gtk', - 'bin/key-mapper-service' - ], - long_description=long_description, - long_description_content_type='text/markdown' )