Build tweaks

4 files changed, 9 insertions, 30 deletions

diff --git a/Dockerfile b/Dockerfile
index 941d5ff..3a5500e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ MAINTAINER Paweł Jastrzębski <pawelj@iosphe.re>
 ENV KCCVER 4.6.5
 ADD . /app
 
-RUN pip3 install pillow python-slugify psutil scandir https://github.com/pyinstaller/pyinstaller/archive/develop.zip
+RUN pip3 install pillow python-slugify psutil scandir pyinstaller
 RUN gem install fpm
 RUN useradd -ms /bin/bash kcc && chown -R kcc:kcc /app
 
@@ -17,8 +17,8 @@ RUN mkdir -p dist/usr/bin dist/usr/share/applications dist/usr/share/doc/kindlec
 RUN mv dist/kcc dist/usr/bin
 RUN cp icons/comic2ebook.png dist/usr/share/kindlecomicconverter
 RUN cp LICENSE.txt dist/usr/share/doc/kindlecomicconverter/copyright
-RUN cp other/kindlecomicconverter.desktop dist/usr/share/applications
-RUN cp other/kindlecomicconverter dist/usr/share/lintian/overrides
+RUN cp other/linux/kindlecomicconverter.desktop dist/usr/share/applications
+RUN cp other/linux/kindlecomicconverter dist/usr/share/lintian/overrides
 
 WORKDIR /app/dist
 RUN fpm -f -s dir -t deb -n kindlecomicconverter -v $KCCVER -m "Paweł Jastrzębski <pawelj@iosphe.re>" --license "ISC" --description "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" usr
diff --git a/kcc/shared.py b/kcc/shared.py
index 0b06e1c..c6de633 100644
--- a/kcc/shared.py
+++ b/kcc/shared.py
@@ -153,10 +153,10 @@ def dependencyCheck(level):
     if level > 1:
         try:
             from psutil import __version__ as psutilVersion
-            if StrictVersion('3.2.1') > StrictVersion(psutilVersion):
-                missing.append('psutil 3.2.1+')
+            if StrictVersion('3.2.2') > StrictVersion(psutilVersion):
+                missing.append('psutil 3.2.2+')
         except ImportError:
-            missing.append('psutil 3.2.1+')
+            missing.append('psutil 3.2.2+')
         try:
             from slugify import __version__ as slugifyVersion
             if StrictVersion('1.1.4') > StrictVersion(slugifyVersion):
diff --git a/other/osx/Info.plist b/other/osx/Info.plist
index 37e908c..83a65cb 100644
--- a/other/osx/Info.plist
+++ b/other/osx/Info.plist
@@ -6,27 +6,6 @@
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
 	<string>Kindle Comic Converter</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>cbz</string>
-				<string>cbr</string>
-				<string>cb7</string>
-				<string>zip</string>
-				<string>rar</string>
-				<string>7z</string>
-				<string>pdf</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>comic2ebook.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Comics</string>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-	</array>
 	<key>CFBundleExecutable</key>
 	<string>MacOS/Kindle Comic Converter</string>
 	<key>CFBundleGetInfoString</key>
@@ -55,7 +34,7 @@
 	<key>LSHasLocalizedDisplayName</key>
 	<false/>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.8.0</string>
+	<string>10.9.0</string>
 	<key>NSAppleScriptEnabled</key>
 	<false/>
 	<key>NSHumanReadableCopyright</key>
diff --git a/setup.py b/setup.py
index 21a2ac2..57260b0 100755
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ class BuildBinaryCommand(distutils.cmd.Command):
             os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/unrar', 0o777)
             os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/7za', 0o777)
             if os.path.isfile('setup.sh'):
-                os.system('setup.sh')
+                os.system('./setup.sh')
             os.system('appdmg kcc.json dist/KindleComicConverter_osx_' + VERSION + '.dmg')
             exit(0)
         elif sys.platform == 'win32':
@@ -109,7 +109,7 @@ class BuildCommand(build):
             packages=['kcc'],
             install_requires=[
                 'Pillow>=3.0.0',
-                'psutil>=3.2.1',
+                'psutil>=3.2.2',
                 'python-slugify>=1.1.4',
             ],
             zip_safe=False,