From 40b6f12e64723a30e4c5c16a369d2687d596717c Mon Sep 17 00:00:00 2001 From: Samuel Walker Date: Fri, 21 Jun 2024 16:23:39 -0600 Subject: [PATCH] push --- Backend.py | 5 +++++ build-windows.sh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Backend.py b/Backend.py index c8cadc4..7e28725 100644 --- a/Backend.py +++ b/Backend.py @@ -10,6 +10,7 @@ import tarfile from pathlib import Path import shutil from FTP import * +import socket def install_prism(): global data_dir @@ -45,12 +46,16 @@ def install_prism(): for ind, line in enumerate(data): if line.startswith("JavaPath="): data[ind] = "JavaPath="+data_dir.replace("\\", "/")+"/java/java-21-"+suff+"/bin/"+cmd+"\n" + if line.startswith("LastHostname="): + data[ind] = "LastHostname="+socket.gethostname()+"\n" + with open(os.path.join(data_dir, "prism", "prismlauncher.cfg"), 'w') as file: file.writelines(data) + def get_tar_members_stripped(tar, n_folders_stripped = 1): members = [] for member in tar.getmembers(): diff --git a/build-windows.sh b/build-windows.sh index 13d3098..834350b 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -1,2 +1,2 @@ -wine /home/piwalker/.wine/drive_c/users/piwalker/AppData/Local/Programs/Python/Python312/Scripts/pyinstaller.exe --onefile Main.py --hidden-import=customtkinter --hidden-import='PIL._tkinter_finder' --add-data "CityBase.png:." --add-data "Title.png:." --windowed --add-data="C:\\users\\piwalker\\AppData\\Local\\Programs\\Python\\Python312\\Lib\\site-packages;customtkinter/" -wine /home/piwalker/.wine/drive_c/users/piwalker/AppData/Local/Programs/Python/Python312/Scripts/pyinstaller.exe --onefile Upload.py --hidden-import='PIL._tkinter_finder' --windowed +wine /home/piwalker/.wine/drive_c/users/piwalker/AppData/Local/Programs/Python/Python312/Scripts/pyinstaller.exe --onedir Main.py --hidden-import=customtkinter --hidden-import='PIL._tkinter_finder' --add-data "CityBase.png:." --add-data "Title.png:." --windowed --add-data="C:\\users\\piwalker\\AppData\\Local\\Programs\\Python\\Python312\\Lib\\site-packages;customtkinter/" +wine /home/piwalker/.wine/drive_c/users/piwalker/AppData/Local/Programs/Python/Python312/Scripts/pyinstaller.exe --onedir Upload.py --hidden-import='PIL._tkinter_finder' --windowed