replaced wine to wow64 and base_pfx to none by default
This commit is contained in:
18
winehelper
18
winehelper
@@ -138,7 +138,7 @@ check_variables WINEFSYNC "0"
|
||||
|
||||
check_variables WINEUSERNAME "xuser"
|
||||
check_variables WINEARCH "win64" # or "win32"
|
||||
check_variables WH_WINE_USE "wine_x_tkg_10-0_amd64" # or system
|
||||
check_variables WH_WINE_USE "wine-10.18.1-alt1-wow64" # or system
|
||||
|
||||
check_variables WH_USE_CPCSP_PROXY "0"
|
||||
check_variables CPCSP_PROXY_X86_64_VER "0.6.1-alt1"
|
||||
@@ -1151,10 +1151,7 @@ check_prefix_var () {
|
||||
init_wineprefix () {
|
||||
check_prefix_var
|
||||
|
||||
if [[ "$WINEARCH" == "win32" ]]
|
||||
then check_variables BASE_PFX "defpfx_x86_v01"
|
||||
else check_variables BASE_PFX "defpfx_x64_v01"
|
||||
fi
|
||||
check_variables BASE_PFX "none"
|
||||
|
||||
export DRIVE_C="$WINEPREFIX/drive_c"
|
||||
export XUSER_PATH="$DRIVE_C/users/xuser"
|
||||
@@ -1198,7 +1195,7 @@ init_wineprefix () {
|
||||
|
||||
if [[ ! -d "$WINEPREFIX/dosdevices" ]] ; then
|
||||
create_new_dir "$WINEPREFIX/dosdevices"
|
||||
local run_wbr="1"
|
||||
export REBOOT_PFX="1"
|
||||
fi
|
||||
|
||||
if [[ ! -d "${WINEPREFIX}/dosdevices/c:" ]] ; then
|
||||
@@ -1211,10 +1208,9 @@ init_wineprefix () {
|
||||
try_force_link_dir "$HOME" "${WINEPREFIX}/dosdevices/h:"
|
||||
fi
|
||||
|
||||
if [[ $run_wbr == "1" ]] ; then
|
||||
if [[ $REBOOT_PFX == "1" ]] ; then
|
||||
"$WINELOADER" wineboot -r
|
||||
wait_wineserver
|
||||
unset run_wbr
|
||||
fi
|
||||
|
||||
if [[ -f "$WINEPREFIX/system.reg" ]] \
|
||||
@@ -1371,7 +1367,9 @@ init_wineprefix () {
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg" ; then
|
||||
if ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg" \
|
||||
|| [[ $REBOOT_PFX == "1" ]]
|
||||
then
|
||||
print_info "Запускаем настройку cpcsp_proxy..."
|
||||
CPCSP_PROXY_OK="0"
|
||||
|
||||
@@ -1444,6 +1442,8 @@ init_wineprefix () {
|
||||
do
|
||||
echo "export $var=\"${!var}\"" >> "$WINEPREFIX/last.conf"
|
||||
done
|
||||
|
||||
unset REBOOT_PFX
|
||||
}
|
||||
|
||||
kill_autostart () {
|
||||
|
||||
Reference in New Issue
Block a user