Fix remove_mono breaks dotnet40 on subsequent dotnet* installs #2101
Conversation
We should not be removing mscoree.dll in all dotnet* installs because it could have been placed by the dotnet40 verb, which would cause subsequent dotnet* verbs to break dotnet40. The deletion should instead only happen when the native dotnet is detected. We continue to remove the registry keys in any case, though, since they are only relevant to the native DLL. Closes Winetricks#2072
|
Hi. I have the following suggestion, leaving it outside of the if grep --quiet --text "WINE_MONO_OVERRIDES" ${W_WINDIR_UNIX}/system32/mscoree.dll; then
w_try rm -f "${W_WINDIR_UNIX}/system32/mscoree.dll"
fi
if grep --quiet --text "WINE_MONO_OVERRIDES" ${W_WINDIR_UNIX}/syswow64/mscoree.dll; then
w_try rm -f "${W_WINDIR_UNIX}/syswow64/mscoree.dll"
fiI arrived at this because I think I witnessed it still being removed while trying to debug things, but I can't say right now if it's really a thing or not. In any case, this should make it idempotent in a way. |
I agree that this is better. I'll update the PR when I get off work. Thanks! |
|
Please fix the quoting errors that shellcheck pointed out; the current code will break for prefixes that contain special characters. |
|
@austin987 I've addressed the |
|
@austin987 Any chance of getting this merged? |
|
Yes, sorry for the delay, and thanks @deriamis for the patch! |
We should not be removing mscoree.dll in all dotnet* installs because it could have been placed by the dotnet40 verb, which would cause subsequent dotnet* verbs to break dotnet40. The deletion should instead only happen when the native dotnet is detected. We continue to remove the registry keys in any case, though, since they are only relevant to the native DLL.
Closes #2072