forked from CastroFidel/PortWINE
fix PATH_TO_GAME
This commit is contained in:
parent
828807d753
commit
6e38d19ea2
@ -361,7 +361,7 @@ init_wine_ver () {
|
|||||||
export WINESERVER="${WINEDIR}/bin/wineserver"
|
export WINESERVER="${WINEDIR}/bin/wineserver"
|
||||||
|
|
||||||
export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine"
|
export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine"
|
||||||
if [[ ! -z "${PATH_TO_GAME}" ]] ; then
|
if [[ -d "${PATH_TO_GAME}" ]] ; then
|
||||||
export WINEDLLPATH+=":${PATH_TO_GAME}"
|
export WINEDLLPATH+=":${PATH_TO_GAME}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -462,10 +462,12 @@ pw_init_runtime () {
|
|||||||
export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \
|
export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \
|
||||||
--unshare-home \
|
--unshare-home \
|
||||||
--home="${PW_SANDBOX_HOME_PATH}" \
|
--home="${PW_SANDBOX_HOME_PATH}" \
|
||||||
|
--remove-game-overlay \
|
||||||
${PW_ADD_TO_ARGS_IN_RUNTIME} --"
|
${PW_ADD_TO_ARGS_IN_RUNTIME} --"
|
||||||
else
|
else
|
||||||
export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \
|
export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \
|
||||||
--share-home \
|
--share-home \
|
||||||
|
--remove-game-overlay \
|
||||||
${PW_ADD_TO_ARGS_IN_RUNTIME} --"
|
${PW_ADD_TO_ARGS_IN_RUNTIME} --"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -865,12 +867,7 @@ pw_init_db () {
|
|||||||
else
|
else
|
||||||
orig_IFS="$IFS"
|
orig_IFS="$IFS"
|
||||||
IFS=$'\n'
|
IFS=$'\n'
|
||||||
if [[ "$START_FROM_STEAM" != 1 ]] ; then
|
PW_FIND_DB_FILE=`grep -ilw "#${PORTWINE_DB}.exe" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi`
|
||||||
PW_FIND_DB_FILE=`grep -ilw "#${PORTWINE_DB}.exe" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi`
|
|
||||||
else
|
|
||||||
# BpeMeHHblu` KocTblJlb =)
|
|
||||||
PW_FIND_DB_FILE=`grep -ilw "#${PORTWINE_DB}.exe" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi | head -n 1`
|
|
||||||
fi
|
|
||||||
if [[ `echo "$PW_FIND_DB_FILE" | wc -l` -gt 1 ]] ; then
|
if [[ `echo "$PW_FIND_DB_FILE" | wc -l` -gt 1 ]] ; then
|
||||||
unset ADD_CB_DBFILE
|
unset ADD_CB_DBFILE
|
||||||
for PW_CHECK_DB_FILE in $PW_FIND_DB_FILE ; do
|
for PW_CHECK_DB_FILE in $PW_FIND_DB_FILE ; do
|
||||||
@ -904,7 +901,7 @@ pw_init_db () {
|
|||||||
init_wine_ver &&
|
init_wine_ver &&
|
||||||
print_info "Use ${PORTWINE_DB_FILE} db file."
|
print_info "Use ${PORTWINE_DB_FILE} db file."
|
||||||
fi
|
fi
|
||||||
if [[ -d "${PATH_TO_GAME}" ]] ; then
|
if [[ -z "${PATH_TO_GAME}" ]] || [[ ! -d "${PATH_TO_GAME}" ]]; then
|
||||||
export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )"
|
export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -639,7 +639,10 @@ start_portwine () {
|
|||||||
|
|
||||||
pw_run () {
|
pw_run () {
|
||||||
unset GDK_BACKEND
|
unset GDK_BACKEND
|
||||||
if [[ ! -z "${PATH_TO_GAME}" ]] ; then
|
if [[ ! -z "${PATH_TO_GAME}" ]] && [[ -d "${PATH_TO_GAME}" ]] ; then
|
||||||
|
cd "${PATH_TO_GAME}"
|
||||||
|
elif [[ -f "$portwine_exe" ]] ; then
|
||||||
|
export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )"
|
||||||
cd "${PATH_TO_GAME}"
|
cd "${PATH_TO_GAME}"
|
||||||
else
|
else
|
||||||
cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c"
|
cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c"
|
||||||
|
Loading…
Reference in New Issue
Block a user