Skip to content

Commit

Permalink
Logging: Improve access to log files (#1123)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sonic2kk
sonic2kk authored Jun 16, 2024
1 parent 9c02212 commit 6ac151a
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 1 deletion.
3 changes: 3 additions & 0 deletions lang/chinese.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1284,3 +1284,6 @@ GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility
DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton"
GUI_VORTEXDEVICESCALEFACTOR="Vortex GUI Scale Factor"
DESC_VORTEXDEVICESCALEFACTOR="uses the --device-scale-factor flag to set the Vortex GUI scale. Defaults to 1.0, but if you want a larger GUI you can set it to match your display's scale factor (or the largest scale factor, if using multiple across displays)"
GUI_STLSHMLOG="Current SteamTinkerLaunch log file"
GUI_STLSHMDIR="Current session logging directory"
GUI_STLPERGAMELOGSDIR="Per-game log files"
3 changes: 3 additions & 0 deletions lang/dutch.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1281,3 +1281,6 @@ GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility
DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton"
GUI_VORTEXDEVICESCALEFACTOR="Vortex GUI Scale Factor"
DESC_VORTEXDEVICESCALEFACTOR="uses the --device-scale-factor flag to set the Vortex GUI scale. Defaults to 1.0, but if you want a larger GUI you can set it to match your display's scale factor (or the largest scale factor, if using multiple across displays)"
GUI_STLSHMLOG="Current SteamTinkerLaunch log file"
GUI_STLSHMDIR="Current session logging directory"
GUI_STLPERGAMELOGSDIR="Per-game log files"
3 changes: 3 additions & 0 deletions lang/english.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1283,3 +1283,6 @@ GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility
DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton"
GUI_VORTEXDEVICESCALEFACTOR="Vortex GUI Scale Factor"
DESC_VORTEXDEVICESCALEFACTOR="uses the --device-scale-factor flag to set the Vortex GUI scale. Defaults to 1.0, but if you want a larger GUI you can set it to match your display's scale factor (or the largest scale factor, if using multiple across displays)"
GUI_STLSHMLOG="Current SteamTinkerLaunch log file"
GUI_STLSHMDIR="Current session logging directory"
GUI_STLPERGAMELOGSDIR="Per-game log files"
3 changes: 3 additions & 0 deletions lang/englishUK.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1285,3 +1285,6 @@ GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility
DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton"
GUI_VORTEXDEVICESCALEFACTOR="Vortex GUI Scale Factor"
DESC_VORTEXDEVICESCALEFACTOR="uses the --device-scale-factor flag to set the Vortex GUI scale. Defaults to 1.0, but if you want a larger GUI you can set it to match your display's scale factor (or the largest scale factor, if using multiple across displays)"
GUI_STLSHMLOG="Current SteamTinkerLaunch log file"
GUI_STLSHMDIR="Current session logging directory"
GUI_STLPERGAMELOGSDIR="Per-game log files"
3 changes: 3 additions & 0 deletions lang/french.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1282,3 +1282,6 @@ GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility
DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton"
GUI_VORTEXDEVICESCALEFACTOR="Vortex GUI Scale Factor"
DESC_VORTEXDEVICESCALEFACTOR="uses the --device-scale-factor flag to set the Vortex GUI scale. Defaults to 1.0, but if you want a larger GUI you can set it to match your display's scale factor (or the largest scale factor, if using multiple across displays)"
GUI_STLSHMLOG="Current SteamTinkerLaunch log file"
GUI_STLSHMDIR="Current session logging directory"
GUI_STLPERGAMELOGSDIR="Per-game log files"
3 changes: 3 additions & 0 deletions lang/german.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1285,3 +1285,6 @@ GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility
DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton"
GUI_VORTEXDEVICESCALEFACTOR="Vortex GUI Scale Factor"
DESC_VORTEXDEVICESCALEFACTOR="uses the --device-scale-factor flag to set the Vortex GUI scale. Defaults to 1.0, but if you want a larger GUI you can set it to match your display's scale factor (or the largest scale factor, if using multiple across displays)"
GUI_STLSHMLOG="Current SteamTinkerLaunch log file"
GUI_STLSHMDIR="Current session logging directory"
GUI_STLPERGAMELOGSDIR="Per-game log files"
3 changes: 3 additions & 0 deletions lang/italian.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1283,3 +1283,6 @@ GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility
DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton"
GUI_VORTEXDEVICESCALEFACTOR="Vortex GUI Scale Factor"
DESC_VORTEXDEVICESCALEFACTOR="uses the --device-scale-factor flag to set the Vortex GUI scale. Defaults to 1.0, but if you want a larger GUI you can set it to match your display's scale factor (or the largest scale factor, if using multiple across displays)"
GUI_STLSHMLOG="Current SteamTinkerLaunch log file"
GUI_STLSHMDIR="Current session logging directory"
GUI_STLPERGAMELOGSDIR="Per-game log files"
3 changes: 3 additions & 0 deletions lang/polish.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1283,3 +1283,6 @@ GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility
DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton"
GUI_VORTEXDEVICESCALEFACTOR="Vortex GUI Scale Factor"
DESC_VORTEXDEVICESCALEFACTOR="uses the --device-scale-factor flag to set the Vortex GUI scale. Defaults to 1.0, but if you want a larger GUI you can set it to match your display's scale factor (or the largest scale factor, if using multiple across displays)"
GUI_STLSHMLOG="Current SteamTinkerLaunch log file"
GUI_STLSHMDIR="Current session logging directory"
GUI_STLPERGAMELOGSDIR="Per-game log files"
3 changes: 3 additions & 0 deletions lang/russian.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1283,3 +1283,6 @@ GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility
DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton"
GUI_VORTEXDEVICESCALEFACTOR="Vortex GUI Scale Factor"
DESC_VORTEXDEVICESCALEFACTOR="uses the --device-scale-factor flag to set the Vortex GUI scale. Defaults to 1.0, but if you want a larger GUI you can set it to match your display's scale factor (or the largest scale factor, if using multiple across displays)"
GUI_STLSHMLOG="Current SteamTinkerLaunch log file"
GUI_STLSHMDIR="Current session logging directory"
GUI_STLPERGAMELOGSDIR="Per-game log files"
23 changes: 22 additions & 1 deletion steamtinkerlaunch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
PREFIX="/usr"
PROGNAME="SteamTinkerLaunch"
NICEPROGNAME="Steam Tinker Launch"
PROGVERS="v14.0.20240616-1"
PROGVERS="v14.0.20240616-2"
PROGCMD="${0##*/}"
PROGINTERNALPROTNAME="Proton-stl"
SHOSTL="stl"
Expand Down Expand Up @@ -12960,6 +12960,24 @@ function setGameFilesArray {
GamFiles+=("$MAHUCID/${AID}.conf")
fi

# Open /dev/shm/steamtinkerlaunch directory
if [ -d "$STLSHM" ]; then
GamDesc+=("$GUI_STLSHMDIR")
GamFiles+=("$STLSHM")
fi

# Open logfile at /dev/shm/steamtinkerlaunch/steamtinkerlaunch.log
if [ -f "$TEMPLOG" ]; then
GamDesc+=("$GUI_STLSHMLOG")
GamFiles+=("$TEMPLOG")
fi

# Open game logging directory at, by default, STLCFGDIR/logs/steamtinkerlaunch
if [ -d "$LOGDIR" ]; then
GamDesc+=("$GUI_STLPERGAMELOGSDIR")
GamFiles+=("$LOGDIR")
fi

createCustomCfgs

GamDesc+=("$GUI_STLCVFILE")
Expand Down Expand Up @@ -15781,9 +15799,12 @@ function wineVortexRun {
## Only use SLR is available and (if user explicitly wants to run Vortex with dotnet OR if dotnet6 is not already installed), because the SLR can cause hardlink deployment to fail
## See also: https://github.com/sonic2kk/steamtinkerlaunch/issues/828

writelog "INFO" "${FUNCNAME[0]} - Vortex logs will be stored at '${VWRUN}'"
if [[ -n "${SLRCMD[*]}" && ( "$VORTEXUSESLRPOSTINSTALL" -eq 1 || ! -d "$VORTEXPFX/$DRC/Program Files/dotnet" ) ]]; then
writelog "INFO" "${FUNCNAME[0]} - PATH=\"${SLTPATH}\" LD_LIBRARY_PATH=\"\" WINE=\"${VORTEXWINE}\" WINEARCH=\"win64\" WINEDEBUG=\"-all\" WINEPREFIX=\"${VORTEXPFX}\" \"${SLRCMD[*]}\" \"$*\""
PATH="$STLPATH" LD_LIBRARY_PATH="" LD_PRELOAD="" WINE="$VORTEXWINE" WINEARCH="win64" WINEDEBUG="-all" WINEPREFIX="$VORTEXPFX" "${SLRCMD[@]}" "$@" > "$VWRUN" 2>/dev/null
else
writelog "INFO" "${FUNCNAME[0]} - PATH=\"${SLTPATH}\" LD_LIBRARY_PATH=\"\" WINE=\"${VORTEXWINE}\" WINEARCH=\"win64\" WINEDEBUG=\"-all\" WINEPREFIX=\"${VORTEXPFX}\" \"$*\""
PATH="$STLPATH" LD_LIBRARY_PATH="" LD_PRELOAD="" WINE="$VORTEXWINE" WINEARCH="win64" WINEDEBUG="-all" WINEPREFIX="$VORTEXPFX" "$@" > "$VWRUN" 2>/dev/null
fi

Expand Down

0 comments on commit 6ac151a

Please sign in to comment.