Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vortex: Remove LC_ALL from start command #784

Merged
merged 3 commits into from
Apr 13, 2023
Merged

Vortex: Remove LC_ALL from start command #784

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
023912c
Vortex: Remove LC_ALL from start command
sonic2kk Apr 12, 2023
6db4a33
Depressurizer: Remove LC_ALL
sonic2kk Apr 12, 2023
aad79e0
Merge branch 'master' into vortex-lc
sonic2kk Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions steamtinkerlaunch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
PREFIX="/usr"
PROGNAME="SteamTinkerLaunch"
NICEPROGNAME="Steam Tinker Launch"
PROGVERS="v14.0.20230414-4"
PROGVERS="v14.0.20230414-5"
PROGCMD="${0##*/}"
SHOSTL="stl"
GHURL="https://github.com"
Expand Down Expand Up @@ -13887,7 +13887,8 @@ function addVortexStage {

function wineVortexRun {
sleep 1 # required!
LC_ALL="C" PATH="$STLPATH" LD_LIBRARY_PATH="" LD_PRELOAD="" WINE="$VORTEXWINE" WINEARCH="win64" WINEDEBUG="-all" WINEPREFIX="$VORTEXPFX" "$@" > "$VWRUN" 2>/dev/null
# LC_ALL may not be required anymore
PATH="$STLPATH" LD_LIBRARY_PATH="" LD_PRELOAD="" WINE="$VORTEXWINE" WINEARCH="win64" WINEDEBUG="-all" WINEPREFIX="$VORTEXPFX" "$@" > "$VWRUN" 2>/dev/null
}

function cleanVortex {
Expand Down Expand Up @@ -16017,7 +16018,8 @@ function startDepressurizer {
mkProjDir "$DPRSSUDIR"
cd "$DPRSSUDIR" >/dev/null || return
sleep 1
LC_ALL="C" PATH="$STLPATH" LD_LIBRARY_PATH="" LD_PRELOAD="" WINE="$DPRSWINE" WINEARCH="win64" WINEDEBUG="$DPRSWINEDEBUG" WINEPREFIX="$DPRSPFX" "$DPRSWINE" "$DPRSEXE" >/dev/null 2>/dev/null
# LC_ALL="C" was previously used here, but may not be required anymore
PATH="$STLPATH" LD_LIBRARY_PATH="" LD_PRELOAD="" WINE="$DPRSWINE" WINEARCH="win64" WINEDEBUG="$DPRSWINEDEBUG" WINEPREFIX="$DPRSPFX" "$DPRSWINE" "$DPRSEXE" >/dev/null 2>/dev/null
cd - >/dev/null || return
else
writelog "ERROR" "${FUNCNAME[0]} - Proton Wine for not found - can't start '$DPRSEXE'"
Expand Down