Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various macOS fix #7

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions MSET9_installer_script/mset9.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,10 @@ def run_diskutil_and_wait(command, dev):
if dirname.startswith(tmpprefix):
dirpath = f"{systmp}/{dirname}"
script = f"{dirpath}/mset9.py"
if os.path.exists(script) and os.stat(script).st_mtime > os.stat(thisfile).st_mtime:
tmp_st = os.stat(script)
this_st = os.stat(thisfile)
# hope file size is enough fix... checksum is a bit heavy i assume
if os.path.exists(script) and tmp_st.st_mtime > this_st.st_mtime and tmp_st.st_size == this_st.st_size:
tmpdir = dirpath
break
else:
Expand Down Expand Up @@ -503,7 +506,7 @@ def print_root(self):
prinfo("might also be ios entitlement issue")
prinfo("please install ldid or fix your python manually")
prinfo("(require entitlement com.apple.private.security.disk-device-access)")
elif "Invalid" in msg:
elif "Invalid" in msg or "bytes per sector" in msg:
prbad("Error 15: Not FAT32 formatted or corrupted filesystem.")
prinfo("Please ensure your SD card is properly formatted")
prinfo("Consult: https://wiki.hacks.guide/wiki/Formatting_an_SD_card")
Expand Down