From 40cfd955cc6d05210c4915c5bf8b03bc3ef729f8 Mon Sep 17 00:00:00 2001 From: Ian Burgwin Date: Tue, 28 Jul 2020 09:32:18 -0700 Subject: [PATCH] custominstall: set platform to win32 if it's msys (close #2) --- custominstall.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/custominstall.py b/custominstall.py index 37550c0..7f0bc3b 100644 --- a/custominstall.py +++ b/custominstall.py @@ -12,6 +12,7 @@ from hashlib import sha256 from locale import getpreferredencoding from shutil import copyfile import sys +from sys import platform, executable from tempfile import TemporaryDirectory from traceback import format_exception from typing import BinaryIO, TYPE_CHECKING @@ -29,13 +30,16 @@ from pyctr.type.cia import CIAReader, CIAError from pyctr.type.ncch import NCCHSection from pyctr.util import roundup -is_windows = sys.platform == 'win32' +is_windows = platform == 'win32' + +if platform == 'msys': + platform = 'win32' # used to run the save3ds_fuse binary next to the script frozen = getattr(sys, 'frozen', False) script_dir: str if frozen: - script_dir = dirname(sys.executable) + script_dir = dirname(executable) else: script_dir = dirname(__file__) @@ -191,7 +195,7 @@ class CustomInstall: if frozen: save3ds_fuse_path = join(script_dir, 'bin', 'save3ds_fuse') else: - save3ds_fuse_path = join(script_dir, 'bin', sys.platform, 'save3ds_fuse') + save3ds_fuse_path = join(script_dir, 'bin', platform, 'save3ds_fuse') if is_windows: save3ds_fuse_path += '.exe' if not isfile(save3ds_fuse_path):