tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-26 15:26:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Comment out OSUpgrade prompt lines temporarily, add note to refactor functionality into basic pre-install Diff.

Browse source
This commit is contained in:
TomAwezome 2022-10-16 17:25:15 -04:00
parent fc2e17e756
commit 7902298747
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Misc/OSInstall.ZC
View file

@ -10,6 +10,9 @@
"$$DKGRAY$$ZealOS Boot Loader is written in public-domain ZealC, but only supports BIOS mode.\n\n" \ "$$DKGRAY$$ZealOS Boot Loader is written in public-domain ZealC, but only supports BIOS mode.\n\n" \
"Limine supports UEFI and BIOS mode and multiple boot protocols, but is written in BSD-2 licensed C code, and cannot be modified within ZealOS.$$FG$$\n\n\n" "Limine supports UEFI and BIOS mode and multiple boot protocols, but is written in BSD-2 licensed C code, and cannot be modified within ZealOS.$$FG$$\n\n\n"
// TODO FIXME: refactor OSUpgrade code into optional Diff prompt to compare ISO<->HDD before Install.
// (also test to ensure that Installs to existing installations don't remove existing untracked files)
CDirEntry OSFilesMGFind(CDirEntry *needle_entry, CDirEntry *haystack_list) CDirEntry OSFilesMGFind(CDirEntry *needle_entry, CDirEntry *haystack_list)
{ {
while (haystack_list) while (haystack_list)
@ -445,15 +448,15 @@ Bool DoInstall(Bool prompt_reboot)
DocBottom; DocBottom;
if (vm_install) if (vm_install)
{ {
"\n\nUpgrade an existing install," // "\n\nUpgrade an existing install,"
"\nor create new Installation? (U/I): "; // "\nor create new Installation? (U/I): ";
do // do
ch = ToUpper(CharGet(, FALSE)); // ch = ToUpper(CharGet(, FALSE));
while (ch != 'U' && ch != 'I'); // while (ch != 'U' && ch != 'I');
if (ch == 'U') // if (ch == 'U')
OSUpgrade; // OSUpgrade;
else // else
VMInstallWiz(); VMInstallWiz();
res = TRUE; res = TRUE;
@ -465,22 +468,22 @@ Bool DoInstall(Bool prompt_reboot)
"Continue Install Wizard "; "Continue Install Wizard ";
if (YorN) if (YorN)
{ {
"\n\nUpgrade an existing install," // "\n\nUpgrade an existing install,"
"\nor create new Installation? (U/I): "; // "\nor create new Installation? (U/I): ";
do // do
ch = ToUpper(CharGet(, FALSE)); // ch = ToUpper(CharGet(, FALSE));
while (ch != 'U' && ch != 'I'); // while (ch != 'U' && ch != 'I');
if (ch == 'I') // if (ch == 'I')
{ // {
RegularInstallWiz(); RegularInstallWiz();
res = TRUE; res = TRUE;
} // }
else // else
{ // {
OSUpgrade; // OSUpgrade;
res = TRUE; // res = TRUE;
} // }
} }
else else
prompt_reboot = FALSE; prompt_reboot = FALSE;