Skip to content

Commit

Permalink
Allow installation under linux/wine if using OS override
Browse files Browse the repository at this point in the history
  • Loading branch information
drojf committed Jul 17, 2022
1 parent b8de4c4 commit ef50783
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
6 changes: 5 additions & 1 deletion common.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,11 @@ class Globals:
PROTON_ERROR_MESSAGE = ("It looks like you have installed the game under Proton or Wine\n"
"Please select the game in your Steam Library, right click, choose Properties, then under 'Compatability' force the use of 'Steam Linux Runtime'\n"
"For a video showing how to do this, see here: https://www.youtube.com/watch?v=f1GvONkE9S0\n"
"\n")
"\n"
"If you deliberately want to install under Proton or Wine, follow the 'Linux Wine' instructions here: https://07th-mod.com/wiki/Higurashi/Higurashi-Part-1---Voice-and-Graphics-Patch/\n"
"\n")

PROTON_WITH_ASSETS_OVERRIDE_MESSAGE = "NOTE: Game is running under Proton/Wine, but user has deliberately selected which OS's assets to install, so it is OK"

CA_CERT_PATH = None
URLOPEN_IS_BROKEN = False
Expand Down
5 changes: 4 additions & 1 deletion higurashiInstaller.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,10 @@ def main(fullInstallConfiguration):
windowsExePath = os.path.join(fullInstallConfiguration.installPath, windowsExeName)
print("Checking for Proton install by checking if identifier {} exists".format(windowsExePath))
if os.path.exists(windowsExePath):
raise Exception(common.Globals.PROTON_ERROR_MESSAGE)
if common.Globals.FORCE_ASSET_OS_STRING is None:
raise Exception(common.Globals.PROTON_ERROR_MESSAGE)
else:
print(common.Globals.PROTON_WITH_ASSETS_OVERRIDE_MESSAGE)

# The Partial Manual Install option is mainly for Windows, so please don't assume it works properly on Linux/MacOS
if modOptionParser.partialManualInstall:
Expand Down
5 changes: 4 additions & 1 deletion uminekoInstaller.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,11 @@ def mainUmineko(conf):
gameIsLinuxIdentifierPath = os.path.join(conf.installPath, "lib64/libfreetype.so.6")
print("Checking for Proton install by checking if identifier {} is missing".format(gameIsLinuxIdentifierPath))
if not os.path.exists(gameIsLinuxIdentifierPath):
raise Exception(common.Globals.PROTON_ERROR_MESSAGE +
if common.Globals.FORCE_ASSET_OS_STRING is None:
raise Exception(common.Globals.PROTON_ERROR_MESSAGE +
"\nIf you are absolutely sure you're not using Proton, create a dummy file at [{}] to bypass this error.".format(gameIsLinuxIdentifierPath))
else:
print(common.Globals.PROTON_WITH_ASSETS_OVERRIDE_MESSAGE)

# Create aliases for the temp directories, and ensure they exist beforehand
downloadTempDir = conf.subModConfig.modName + " Downloads"
Expand Down

0 comments on commit ef50783

Please sign in to comment.