tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-01-13 16:16:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor redundant OSInstall print lines.

Browse source
This commit is contained in:
TomAwezome 2022-10-24 04:11:23 -04:00
parent 82ad5d29ac
commit 758bea22f9
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Misc/OSInstall.ZC
View file

@ -83,9 +83,11 @@ U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *
do do
ch = ToUpper(CharGet(, FALSE)); ch = ToUpper(CharGet(, FALSE));
while (ch != 'M' && ch != 'A'); while (ch != 'M' && ch != 'A');
"%c\n", ch;
if (ch == 'M') if (ch == 'M')
{ {
"%c\n", ch;
PopUpOk("\n$$LTGREEN$$FILE2$$FG$$ is new changes.\n" PopUpOk("\n$$LTGREEN$$FILE2$$FG$$ is new changes.\n"
"$$LTRED$$FILE1$$FG$$ is from existing install."); "$$LTRED$$FILE1$$FG$$ is from existing install.");
df_flags = 0; df_flags = 0;
@ -93,7 +95,6 @@ U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *
} }
else else
{ {
"%c\n", ch;
df_flags = DF_REMAINDER_ALL_FILE2 | DF_NO_MORE_PROMPTS_THIS_FILE | DF_KEEP_FLAGS; df_flags = DF_REMAINDER_ALL_FILE2 | DF_NO_MORE_PROMPTS_THIS_FILE | DF_KEEP_FLAGS;
OSFilesMergeInner(tmpde1, tmpde2, &df_flags); OSFilesMergeInner(tmpde1, tmpde2, &df_flags);
} }