Merge branch '7z-mac' into mac

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__)))

setup.py

@@ -12,7 +12,6 @@
 
 import os
 import sys
-import shutil
 import setuptools
 import distutils.cmd
 from kindlecomicconverter import __version__
@@ -39,13 +38,6 @@ def run(self):
  if sys.platform == 'darwin':
 
  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('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)