Merge branch 'acidanthera:master' into YamingNetwork

wy414012 · Aug 18, 2024 · 129a689 · 129a689
2 parents 5637535 + a41b9a7
commit 129a689
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 12 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 OpenCore Changelog
 ==================
+#### v1.0.2
+- Fixed error in macrecovery when running headless, thx @mkorje
+
 #### v1.0.1
 - Updated code and added progress bar to macrecovery, thx @soyeonswife63
 - Bundled fat binary i386/x64 10.6+ compatible `nvramdump` with LogoutHook release

diff --git a/Docs/Configuration.md5 b/Docs/Configuration.md5
@@ -1 +1 @@
-b6d1384b2c506501f6c1c41f77aa7473
+b793988590c9e9ddd71ce9318abe5369
diff --git a/Docs/Configuration.pdf b/Docs/Configuration.pdf
diff --git a/Docs/Configuration.tex b/Docs/Configuration.tex
@@ -94,7 +94,7 @@
 
        \vspace{0.2in}
 
-       Reference Manual (1.0.1)
+       Reference Manual (1.0.2)
 
        \vspace{0.2in}
 

diff --git a/Docs/Differences/Differences.pdf b/Docs/Differences/Differences.pdf
diff --git a/Docs/Differences/Differences.tex b/Docs/Differences/Differences.tex
@@ -1,7 +1,7 @@
 \documentclass[]{article}
 %DIF LATEXDIFF DIFFERENCE FILE
-%DIF DEL PreviousConfiguration.tex   Fri May 10 15:27:32 2024
-%DIF ADD ../Configuration.tex        Fri May 10 15:27:32 2024
+%DIF DEL PreviousConfiguration.tex   Fri Aug 16 15:32:06 2024
+%DIF ADD ../Configuration.tex        Fri Aug 16 15:32:06 2024
 
 \usepackage{lmodern}
 \usepackage{amssymb,amsmath}
@@ -118,7 +118,7 @@
 %DIF HYPERREF PREAMBLE %DIF PREAMBLE
 \providecommand{\DIFadd}[1]{\texorpdfstring{\DIFaddtex{#1}}{#1}} %DIF PREAMBLE
 \providecommand{\DIFdel}[1]{\texorpdfstring{\DIFdeltex{#1}}{}} %DIF PREAMBLE
-%DIF COLORLISTINGS PREAMBLE %DIF PREAMBLE
+%DIF LISTINGS PREAMBLE %DIF PREAMBLE
 \RequirePackage{listings} %DIF PREAMBLE
 \RequirePackage{color} %DIF PREAMBLE
 \lstdefinelanguage{DIFcode}{ %DIF PREAMBLE
@@ -154,7 +154,7 @@
 
        \vspace{0.2in}
 
-       Reference Manual (1.0\DIFdelbegin \DIFdel{.0}\DIFdelend \DIFaddbegin \DIFadd{.1}\DIFaddend )
+       Reference Manual (1.0\DIFdelbegin \DIFdel{.1}\DIFdelend \DIFaddbegin \DIFadd{.2}\DIFaddend )
 
        \vspace{0.2in}
 

diff --git a/Docs/Differences/PreviousConfiguration.tex b/Docs/Differences/PreviousConfiguration.tex
@@ -94,7 +94,7 @@
 
        \vspace{0.2in}
 
-       Reference Manual (1.0.0)
+       Reference Manual (1.0.1)
 
        \vspace{0.2in}
 

diff --git a/Docs/Errata/Errata.pdf b/Docs/Errata/Errata.pdf
diff --git a/Include/Acidanthera/Library/OcMainLib.h b/Include/Acidanthera/Library/OcMainLib.h
@@ -30,7 +30,7 @@
   OpenCore version reported to log and NVRAM.
   OPEN_CORE_VERSION must follow X.Y.Z format, where X.Y.Z are single digits.
 **/
-#define OPEN_CORE_VERSION  "1.0.1"
+#define OPEN_CORE_VERSION  "1.0.2"
 
 /**
   OpenCore build type reported to log and NVRAM.

diff --git a/Utilities/macrecovery/macrecovery.py b/Utilities/macrecovery/macrecovery.py
@@ -44,6 +44,8 @@
 INFO_SIGN_SESS = 'CT'
 INFO_REQURED = [INFO_PRODUCT, INFO_IMAGE_LINK, INFO_IMAGE_HASH, INFO_IMAGE_SESS, INFO_SIGN_LINK, INFO_SIGN_HASH, INFO_SIGN_SESS]
 
+# Use -2 for better resize stability on Windows
+TERMINAL_MARGIN = 2
 
 def run_query(url, headers, post=None, raw=False):
     if post is not None:
@@ -223,10 +225,9 @@ def save_image(url, sess, filename='', directory=''):
                 break
             fh.write(chunk)
             size += len(chunk)
-            terminalsize = os.get_terminal_size().columns
+            terminalsize = max(os.get_terminal_size().columns - TERMINAL_MARGIN, 0)
             if oldterminalsize != terminalsize:
-                # Use -2 for better resize stability on Windows
-                print(f'\r{"":<{terminalsize - 2}}', end='')
+                print(f'\r{"":<{terminalsize}}', end='')
                 oldterminalsize = terminalsize
             if totalsize > 0:
                 progress = size / totalsize
@@ -249,7 +250,8 @@ def verify_image(dmgpath, cnkpath):
 
     with open(dmgpath, 'rb') as dmgf:
         for cnkcount, (cnksize, cnkhash) in enumerate(verify_chunklist(cnkpath), 1):
-            print(f'\r{f"Chunk {cnkcount} ({cnksize} bytes)":<{os.get_terminal_size().columns - 2}}', end='')
+            terminalsize = max(os.get_terminal_size().columns - TERMINAL_MARGIN, 0)
+            print(f'\r{f"Chunk {cnkcount} ({cnksize} bytes)":<{terminalsize}}', end='')
             sys.stdout.flush()
             cnk = dmgf.read(cnksize)
             if len(cnk) != cnksize:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b6d1384b2c506501f6c1c41f77aa7473
		b793988590c9e9ddd71ce9318abe5369