v0.8.5 - Script local restore and firstrun backup

Author: Coopydood

.gitignore

@@ -17,3 +17,11 @@ willthisbedetected.sh
 resources/WEBVERSION
 boot-noPT.sh
 ovmf/OVMF_VARS-1280x720.fd
+setup.py
+resources/script_store/*.py
+resources/script_store/*.sh
+resources/script_store/*.json
+resources/script_store/extras/*.py
+resources/script_store/extras/*.sh
+resources/script_store/restore/*.py
+resources/script_store/restore/*.sh

README.md

@@ -1,5 +1,5 @@
 # ultimate-macOS-KVM
-### v0.8.4
+### v0.8.5
 Helping you build the ultimate macOS virtual machine, powered by KVM.
 
 ## Introduction

VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

docs/changelogs/v0-8-5.md

@@ -0,0 +1,13 @@
+## v0.8.5
+### Minor update • 13/04/2023
+
+This update includes the following features / fixes / changes:
+
+- Original script versions from initial user clone are now backed up on first run
+- Local restoration now includes core scripts
+- Fixed an issue with permissions not being set correctly
+- Truncated wording in restore scripts
+
+To see individual code changes, visit the project's commits page at https://github.com/Coopydood/ultimate-macOS-KVM/commits/main 
+
+Remember, commits by Coopydood will always be signed as **4CD28348A3DD016F** or GitHub's public key. 

resources/script_store/SCRIPT_STORE_CONTROL

@@ -48,7 +48,7 @@ class color:
 print("\n\n   "+color.BOLD+color.RED+"↺  RESET ALL COMPONENTS LOCALLY"+color.END,"")
 print("   Please wait\n")
 print(color.END+"\n\n\n   Checking integrity...\n\n\n\n\n")
-if os.path.exists("./resources/oc_store/compat_new/OpenCore.qcow2") and os.path.exists("./resources/oc_store/compat_old/OpenCore.qcow2") and os.path.exists("./resources/ovmf/OVMF_CODE.fd") and os.path.exists("./resources/ovmf/OVMF_VARS.fd") and os.path.exists("./resources/ovmf/OVMF_VARS-1280x720.fd") and os.path.exists("./resources/oc_store/compat_new/config.plist"):
+if os.path.exists("./resources/oc_store/compat_new/OpenCore.qcow2") and os.path.exists("./resources/oc_store/compat_old/OpenCore.qcow2") and os.path.exists("./resources/ovmf/OVMF_CODE.fd") and os.path.exists("./resources/ovmf/OVMF_VARS.fd") and os.path.exists("./resources/ovmf/OVMF_VARS-1280x720.fd") and os.path.exists("./resources/oc_store/compat_new/config.plist") and os.path.exists("./resources/script_store/extras.py") and os.path.exists("./resources/script_store/setup.py"):
     integrity = 1
 else:
     integrity = 0
@@ -63,7 +63,7 @@ class color:
 print("\n\n   "+color.BOLD+color.RED+"↺  RESET ALL COMPONENTS LOCALLY"+color.END,"")
 print("   Restore to default state\n")
 
-print(color.BOLD+"   Integrity Check")
+print(color.BOLD+"   Integrity")
 if integrity == 1:
    print(color.GREEN+color.BOLD+"   ●"+color.END+" PASSED")
 else:
@@ -77,6 +77,7 @@ class color:
     print(color.BOLD+color.GREEN+"       WILL "+color.END+"replace the OVMF code with a new copy")
     print(color.BOLD+color.GREEN+"       WILL "+color.END+"fix permissions on resources")
     print(color.BOLD+color.YELLOW+"      MIGHT "+color.END+"fix some quirky issues")
+    print(color.BOLD+color.YELLOW+"      MIGHT "+color.END+"restore older versions of repository files")
     print(color.BOLD+color.RED+"   WILL NOT "+color.END+"delete your configs or vHDD files")
     print(color.BOLD+color.RED+"   WILL NOT "+color.END+"create a backup of reset files")
 
@@ -122,9 +123,10 @@ def throwError():
     #os.system("rm ./blobs/*.apb > /dev/null 2>&1")
     #os.system("rm ./blobs/stale/*.apb > /dev/null 2>&1")
     os.system("rm ./resources/config.sh > /dev/null 2>&1")
-    os.system("chmod +x -R scripts/*.py")
-    os.system("chmod +x -R scripts/*.sh")
-    os.system("chmod +x resources/dmg2img")
+    os.system("rm ./setup.py > /dev/null 2>&1")
+    os.system("rm ./scripts/* > /dev/null 2>&1")
+    os.system("rm ./scripts/restore/* > /dev/null 2>&1")
+    os.system("rm ./scripts/extras/* > /dev/null 2>&1")
     time.sleep(4)
 
     global USR_TARGET_OS
@@ -150,7 +152,8 @@ def throwError():
         os.system("cp -R resources/oc_store/compat_new/EFI boot/EFI")
 
 
-
+    os.system("cp -R ./resources/script_store/* ./scripts/")
+    os.system("mv ./scripts/setup.py ./setup.py")
     os.system("cp ./resources/ovmf/OVMF_CODE.fd ./ovmf/OVMF_CODE.fd")
     os.system("cp ./ovmf/var/OVMF_VARS.fd ./ovmf/OVMF_VARS.fd")
 
@@ -160,7 +163,10 @@ def throwError():
     if os.path.exists("boot/OpenCore.qcow2"):
         if os.path.exists("ovmf/OVMF_CODE.fd"):
             if os.path.exists("boot/EFI/"):
-                success()
+                if os.path.exists("scripts/extras.py"):
+                    success()
+                else:
+                    throwError()
             else:
                 throwError()
         else:

scripts/restore/localfull.py

@@ -63,7 +63,7 @@ class color:
 print("\n\n   "+color.BOLD+color.RED+"↺  RESET vNVRAM"+color.END,"")
 print("   Restore to default state\n")
 
-print(color.BOLD+"   Integrity Check")
+print(color.BOLD+"   Integrity")
 if integrity == 1:
    print(color.GREEN+color.BOLD+"   ●"+color.END+" PASSED")
 else:

scripts/restore/nvram.py

@@ -86,7 +86,7 @@ def have_internet() -> bool:
 
 if integrity == 1:
     print(color.END+color.BOLD+"\n   THIS TOOL:")
-    print(color.BOLD+color.BLUE+"   DOWNLOADS "+color.END+"a full copy of the latest project")
+    print(color.BOLD+color.BLUE+"   DOWNLOADS "+color.END+"a full copy of the latest repository")
     print(color.BOLD+color.GREEN+"        WILL "+color.END+color.BOLD+"reset ALL non-user repository files")
     print(color.BOLD+color.GREEN+"        WILL "+color.END+"fix permissions on resources")
     print(color.BOLD+color.GREEN+"        WILL "+color.END+"repair any component corruption")

scripts/restore/obliterator.py

@@ -63,7 +63,7 @@ class color:
 print("\n\n   "+color.BOLD+color.RED+"↺  RESET OPENCORE AND vNVRAM"+color.END,"")
 print("   Restore to default state\n")
 
-print(color.BOLD+"   Integrity Check")
+print(color.BOLD+"   Integrity")
 if integrity == 1:
    print(color.GREEN+color.BOLD+"   ●"+color.END+" PASSED")
 else:

scripts/restore/ocimage.py

@@ -63,7 +63,7 @@ class color:
 print("\n\n   "+color.BOLD+color.RED+"↺  RESET OVMF CODE"+color.END,"")
 print("   Restore to default state\n")
 
-print(color.BOLD+"   Integrity Check")
+print(color.BOLD+"   Integrity")
 if integrity == 1:
    print(color.GREEN+color.BOLD+"   ●"+color.END+" PASSED")
 else: