diff --git a/kcc.py b/kcc.py index 3c18461d..eb00c59c 100755 --- a/kcc.py +++ b/kcc.py @@ -34,13 +34,13 @@ if getattr(sys, 'frozen', False): os.environ['PATH'] += os.pathsep + os.pathsep.join(mac_paths + [ - os.path.dirname(os.path.abspath(sys.executable)) + '/../Resources', + '/opt/homebrew/bin', '/usr/local/bin', '/usr/bin', '/bin', ] ) - os.chdir(os.path.dirname(os.path.abspath(sys.executable)) + '/../Resources') + os.chdir(os.path.dirname(os.path.abspath(sys.executable))) else: os.environ['PATH'] += os.pathsep + os.pathsep.join(mac_paths) os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/other/osx/7z b/other/osx/7z deleted file mode 100755 index e0d826b8..00000000 Binary files a/other/osx/7z and /dev/null differ diff --git a/other/osx/7z.so b/other/osx/7z.so deleted file mode 100644 index 84d52856..00000000 Binary files a/other/osx/7z.so and /dev/null differ diff --git a/other/osx/Rar.so b/other/osx/Rar.so deleted file mode 100644 index bc21ea1f..00000000 Binary files a/other/osx/Rar.so and /dev/null differ diff --git a/setup.py b/setup.py index 51259fd5..44e5972d 100644 --- a/setup.py +++ b/setup.py @@ -47,14 +47,7 @@ def run(self): file.write(filedata) os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s kcc.py') - os.makedirs('dist/Kindle Comic Converter.app/Contents/Resources/Codecs') - 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/Rar.so', 'dist/Kindle Comic Converter.app/Contents/Resources/Codecs') 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/7z', 0o777) # TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v os.system('appdmg kcc.json dist/KindleComicConverter_osx_' + VERSION + '.dmg') exit(0)