Config: Allow the use of portable.txt #10984
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kamfretoz
approved these changes
Mar 28, 2024
knight-ryu12
approved these changes
Mar 28, 2024
JordanTheToaster
approved these changes
Mar 28, 2024
updater/Updater.cpp
Outdated
| @@ -193,7 +193,8 @@ bool Updater::ParseZip() | |||
| // skip updater itself, since it was already pre-extracted. | |||
| // also skips portable.ini to not mess with future non-portable installs. | |||
| if (StringUtil::Strcasecmp(entry.destination_filename.c_str(), "updater.exe") != 0 && | |||
| StringUtil::Strcasecmp(entry.destination_filename.c_str(), "portable.ini") != 0) | |||
| StringUtil::Strcasecmp(entry.destination_filename.c_str(), "portable.ini")!= 0 || | |||
| StringUtil::Strcasecmp(entry.destination_filename.c_str(), "portable.txt")!= 0) | |||
There was a problem hiding this comment.
you need to put these 2 lines in brackets, if you don't that means only the portable file has to exist.
Mrlinkwii
force-pushed
the
death
branch
2 times, most recently
from
c335df3
to
62a256a
Compare
stenzek
approved these changes
Mar 29, 2024
stenzek
changed the title
vertver
pushed a commit
to vertver/pcsx2-gdbserver
that referenced
this pull request
Apr 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Changes
allows the use of portable.txt as well as portable.ini
Rationale behind Changes
on some OS's it may be difficult to create ini files automatically , thus makes its more easier for the users on this OS to create the portable file
Suggested Testing Steps
create a portable.txt /.ini and make sure portable mode works
updater needs checked