See earlier PRs #873
Merged
See earlier PRs #873
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
|
Finally! |
Godsbane
reviewed
Oct 4, 2023
Godsbane
reviewed
Oct 4, 2023
Godsbane
reviewed
Oct 4, 2023
responding to reviews from Godsbane
derp. mixed up the cloned folder and the installed folder.
| @@ -102,7 +103,31 @@ Citra_setABXYstyle(){ | |||
|
|
|||
| #Migrate | |||
| Citra_migrate(){ | |||
| echo "NYI" | |||
| echo "Begin Citra Migration" | |||
| emu="Citra" | |||
There was a problem hiding this comment.
Could also use Citra_emuName here.
| rsync -av "${origPath}citra/sdmc" "${storagePath}/citra/" && rm -rf "${origPath}citra/sdmc" | ||
| rsync -av "${origPath}citra/nand" "${storagePath}/citra/" && rm -rf "${origPath}citra/nand" | ||
| rsync -av "${origPath}citra/screenshots" "${storagePath}/citra/" && rm -rf "${origPath}citra/screenshots" | ||
| rsync -av "${origPath}citra/tas" "${storagePath}/citra/" && rm -rf "${origPath}citra/tas" | ||
| } |
There was a problem hiding this comment.
Below, Citra_IsInstalled should be updated:
migrationFlag="$HOME/.config/EmuDeck/.${Citra_emuName}MigrationCompleted"
if [ ! -f "$migrationFlag" ]; then
isFpInstalled "$Citra_emuPath"
else
if [ -e "$HOME/.config/citra-emu" ]; then
echo "true"
else
echo "false
fi
fi
| @@ -15,7 +15,8 @@ Citra_finalize(){ | |||
| Citra_install(){ | |||
| setMSG "Installing $Citra_emuName" | |||
| installEmuFP "${Citra_emuName}" "${Citra_emuPath}" | |||
There was a problem hiding this comment.
Why is installEmuFP still here?
| @@ -15,7 +15,8 @@ Citra_finalize(){ | |||
| Citra_install(){ | |||
| setMSG "Installing $Citra_emuName" | |||
| installEmuFP "${Citra_emuName}" "${Citra_emuPath}" | |||
| flatpak override "${Citra_emuPath}" --filesystem=host --user | |||
| curl -L https://github.com/citra-emu/citra-web/releases/download/2.0/citra-setup-linux > citra-setup-linux && chmod +x citra-setup-linux && ./citra-setup-linux --accept-licenses --confirm-command install | |||
| rm citra-setup-linux | |||
There was a problem hiding this comment.
The binupdate.sh needs to be updated also, so that emulator can be updated. Usually the _Install method is called from binupdate so this code should be modified to handle updates.
| @@ -31,7 +32,7 @@ Citra_init(){ | |||
| #update | |||
| Citra_update(){ | |||
| setMSG "Updating $Citra_emuName settings." | |||
| configEmuFP "${Citra_emuName}" "${Citra_emuPath}" | |||
| cd $HOME/.citra && ./maintenancetool update | |||
There was a problem hiding this comment.
See above, binupdate doesn't call this method.
|
Adding to the review above, the citra.sh launcher should be updated as well. Currently it launches nothing (launches flatpak but not really what we want :)). |
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.
Hopefully this is the one