joey/FishPogPixelmon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

more windows tomfoolery

Browse Source
This commit is contained in:
Joey Eamigh
2023-06-22 00:27:49 -04:00
parent dac9469b37
commit 45d7fe07a5
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/client.ps1
View File

@@ -4,31 +4,17 @@ $winget = Get-Command winget -ErrorAction SilentlyContinue
if (!$winget) { if (!$winget) {
Write-Host "Error: winget is not installed." -Foreground Red Write-Host "Error: winget is not installed." -Foreground Red
Write-Host "This script probably will not work without winget." -Foreground Red Write-Host "This script probably will not work without winget." -Foreground Red
Write-Host "Run 'Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe' in to install winget." -Foreground Red Write-Host "Run 'Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe' and then search for 'App Installer' on the Microsoft Store to install winget." -Foreground Red
Write-Host "If you do install winget, this script should handle the rest." -Foreground Red Write-Host "If you do install winget, this script should handle the rest." -Foreground Red
} }
# Check that python is installed
if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
Write-Host "Error: python is not installed." -Foreground Red
if ($winget) {
Write-Host "Attempting to install python."
(winget install --id=Python.Python.3.11 -e) | Out-Null
}
else {
Write-Host "Please install python to continue." -Foreground Red
exit 1
}
}
# Check that java is installed # Check that java is installed
if (-not (Get-Command "C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot\bin\java" -ErrorAction SilentlyContinue)) { if (-not (Get-Command "C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot\bin\java" -ErrorAction SilentlyContinue)) {
Write-Host "Error: java is not installed." -Foreground Red Write-Host "Error: java is not installed." -Foreground Red
if ($winget) { if ($winget) {
Write-Host "Attempting to install java." Write-Host "Attempting to install java."
(winget install AdoptOpenJDK.OpenJDK.11) | Out-Null winget install AdoptOpenJDK.OpenJDK.11
} }
else { else {
Write-Host "Please install java to continue." -Foreground Red Write-Host "Please install java to continue." -Foreground Red

2
client/client.py
View File

@@ -25,7 +25,7 @@ if OS == "linux":
INSTANCE_DIR = f"{MULTIMC_DIR}/instances/FishPogPixelmon" INSTANCE_DIR = f"{MULTIMC_DIR}/instances/FishPogPixelmon"
if OS == "win32": if OS == "win32":
MULTIMC_PARENT_DIR = f"{os.getenv('APPDATA')}\\FishPog" MULTIMC_PARENT_DIR = f"C:\\Users\\{os.getlogin()}\\AppData\\Roaming\\FishPog"
MULTIMC_DIR = f"{MULTIMC_PARENT_DIR}\\MultiMC" MULTIMC_DIR = f"{MULTIMC_PARENT_DIR}\\MultiMC"
INSTANCE_DIR = f"{MULTIMC_DIR}\\instances\\FishPogPixelmon" INSTANCE_DIR = f"{MULTIMC_DIR}\\instances\\FishPogPixelmon"