diff --git a/.gitignore b/.gitignore index 81778a2d..c9aed8be 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ tools/generate_emu_config/.env*/ tools/generate_emu_config/.vscode/ tools/generate_emu_config/backup/ tools/generate_emu_config/bin/ -tools/generate_emu_config/build/ tools/generate_emu_config/login_temp/ tools/generate_emu_config/output/ tools/generate_emu_config/**/__pycache__/ diff --git a/tools/generate_emu_config/generate_emu_config.py b/tools/generate_emu_config/generate_emu_config.py index 416e5b82..3d1c4c0f 100644 --- a/tools/generate_emu_config/generate_emu_config.py +++ b/tools/generate_emu_config/generate_emu_config.py @@ -581,7 +581,7 @@ def main(): filedata = [''] with open(my_login_file, "r", encoding="utf-8") as f: filedata = f.readlines() - filedata = list(map(lambda s: s.strip().replace("\r", "").replace("\n", ""), filedata)) + filedata = list(map(lambda s: s.replace("\r", "").replace("\n", ""), filedata)) filedata = [l for l in filedata if l] if len(filedata) == 2: USERNAME = filedata[0] diff --git a/tools/generate_emu_config/rebuild_linux.sh b/tools/generate_emu_config/rebuild_linux.sh index a5dea899..9031034d 100644 --- a/tools/generate_emu_config/rebuild_linux.sh +++ b/tools/generate_emu_config/rebuild_linux.sh @@ -3,7 +3,7 @@ venv=".env-linux" out_dir="bin/linux" -build_temp_dir="build/tmp/linux" +build_temp_dir="bin/tmp/linux" tool_name="generate_emu_config" main_file="generate_emu_config.py" @@ -22,6 +22,8 @@ pyinstaller "$main_file" --distpath "$out_dir" -y --clean --onedir --name "$tool cp -f "steam_default_icon_locked.jpg" "$out_dir/$tool_name" cp -f "steam_default_icon_unlocked.jpg" "$out_dir/$tool_name" cp -f "README.md" "$out_dir/$tool_name" +echo "Check the README" > "$out_dir/$tool_name/my_login.EXAMPLE.txt" +echo "Check the README" > "$out_dir/$tool_name/top_owners_ids.EXAMPLE.txt" echo; echo ============= diff --git a/tools/generate_emu_config/rebuild_win.bat b/tools/generate_emu_config/rebuild_win.bat index ba22fb7c..a300c22a 100644 --- a/tools/generate_emu_config/rebuild_win.bat +++ b/tools/generate_emu_config/rebuild_win.bat @@ -5,7 +5,7 @@ pushd "%~dp0" set "venv=.env-win" set "out_dir=bin\win" -set "build_temp_dir=build\tmp\win" +set "build_temp_dir=bin\tmp\win" set "tool_name=generate_emu_config" set "icon_file=icon\Froyoshark-Enkel-Steam.ico" set "main_file=generate_emu_config.py" @@ -43,6 +43,8 @@ for /f "usebackq tokens=* delims=" %%A in ('"%main_file%"') do ( copy /y "steam_default_icon_locked.jpg" "%out_dir%\%tool_name%\" copy /y "steam_default_icon_unlocked.jpg" "%out_dir%\%tool_name%\" copy /y "README.md" "%out_dir%\%tool_name%\" +1>"%out_dir%\%tool_name%\my_login.EXAMPLE.txt" echo Check the README +1>"%out_dir%\%tool_name%\top_owners_ids.EXAMPLE.txt" echo Check the README echo: echo =============