Merge pull request #306 from ciromattia/dev

5.5.0

1 files changed, 6 insertions, 23 deletions

diff --git a/setup.py b/setup.py
index f7d71e0..7bc5c8d 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ pip/pyinstaller build script for KCC.
 Install as Python package:
     python3 setup.py install
 
-Create EXE/APP/DEB:
+Create EXE/APP:
     python3 setup.py build_binary
 """
 
@@ -37,35 +37,18 @@ class BuildBinaryCommand(distutils.cmd.Command):
         VERSION = __version__
         if sys.platform == 'darwin':
             os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s kcc.py')
-            shutil.copy('other/osx/7za', 'dist/Kindle Comic Converter.app/Contents/Resources')
-            shutil.copy('other/osx/unrar', 'dist/Kindle Comic Converter.app/Contents/Resources')
+            shutil.copy('other/osx/7z', 'dist/Kindle Comic Converter.app/Contents/Resources')
+            shutil.copy('other/osx/7z.so', 'dist/Kindle Comic Converter.app/Contents/Resources')
             shutil.copy('other/osx/Info.plist', 'dist/Kindle Comic Converter.app/Contents')
             shutil.copy('LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources')
             shutil.copy('other/windows/Additional-LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources')
-            os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/unrar', 0o777)
-            os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/7za', 0o777)
+            os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/7z', 0o777)
             os.system('appdmg kcc.json dist/KindleComicConverter_osx_' + VERSION + '.dmg')
             exit(0)
         elif sys.platform == 'win32':
-            os.system('pyinstaller -y -F -i icons\comic2ebook.ico -n KCC -w --noupx kcc.py')
+            os.system('pyinstaller -y -F -i icons\\comic2ebook.ico -n KCC -w --noupx kcc.py')
             exit(0)
         else:
-            os.system('pyinstaller -y -F kcc.py')
-            os.system('mkdir -p dist/usr/bin dist/usr/share/applications dist/usr/share/doc/kindlecomicconverter '
-                      'dist/usr/share/kindlecomicconverter dist/usr/share/lintian/overrides')
-            os.system('mv dist/kcc dist/usr/bin')
-            os.system('cp icons/comic2ebook.png dist/usr/share/kindlecomicconverter')
-            os.system('cp LICENSE.txt dist/usr/share/doc/kindlecomicconverter/copyright')
-            os.system('cp other/linux/kindlecomicconverter.desktop dist/usr/share/applications')
-            os.system('cp other/linux/kindlecomicconverter dist/usr/share/lintian/overrides')
-            os.chdir('dist')
-            os.system('fpm -f -s dir -t deb -n kindlecomicconverter -v ' + VERSION +
-                      ' -m "Pawel Jastrzebski <[email protected]>" --license "ISC" '
-                      '--description "$(printf "Comic and Manga converter for e-book '
-                      'readers.\nThis app allows you to transform your PNG, JPG, GIF, '
-                      'CBZ, CBR and CB7 files\ninto EPUB or MOBI format e-books.")" '
-                      '--url "https://kcc.iosphe.re/" --deb-priority "optional" --vendor "" '
-                      '--category "graphics" -d "unrar | unrar-free" -d "p7zip-full" -d "libc6" usr')
             exit(0)
 
 
@@ -93,7 +76,7 @@ setuptools.setup(
     packages=['kindlecomicconverter'],
     install_requires=[
         'PyQt5>=5.6.0',
-        'Pillow>=4.0.0',
+        'Pillow>=5.2.0',
         'psutil>=5.0.0',
         'python-slugify>=1.2.1',
         'raven>=6.0.0',