added arg: control

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" ]]
+    check_variables BASE_PFX "none"
-    then check_variables BASE_PFX "defpfx_x86_v01"
-    else check_variables BASE_PFX "defpfx_x64_v01"
-    fi
 
     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 () {
@@ -1566,7 +1566,7 @@ wine_regfile () {
 wine_run () {
     local wh_add_args win_file_exec win_file_path win_file_name
 
-    if [[ $1 =~ (winecfg|regedit|winefile|wineconsole) ]] ; then
+    if [[ $1 =~ (winecfg|regedit|winefile|wineconsole|control) ]] ; then
         win_file_exec="$1"
         win_file_name="$win_file_exec"
         win_file_path="$DRIVE_C"
@@ -1616,9 +1616,9 @@ wine_run () {
             | grep -v "ICON" | sort | tee -a "$log_file"
 
         echo -e "\n##### Лог WINE #####" | tee -a "$log_file"
-        $MANGOHUD_RUN "$WINELOADER" $wh_add_args "$win_file_exec" "$@" $LAUNCH_PARAMETERS 2>&1 | tee -a "$log_file"
+        $MANGOHUD_RUN "$WINELOADER" $wh_add_args "$win_file_exec" "$@" 2>&1 | tee -a "$log_file"
     else
-        $MANGOHUD_RUN "$WINELOADER" $wh_add_args "$win_file_exec" "$@" $LAUNCH_PARAMETERS
+        $MANGOHUD_RUN "$WINELOADER" $wh_add_args "$win_file_exec" "$@"
     fi
 
     wait_wineserver
@@ -2628,6 +2628,7 @@ case "$arg1" in
     winereg|regedit) prepair_wine ; wine_run "regedit" ;;
     winefile|explorer) prepair_wine ; wine_run "winefile" ;;
     wineconsole|cmd) prepair_wine ; wine_run "wineconsole" ;;
+    control) prepair_wine ; wine_run "control" ;;
     winetricks) prepair_wine ; "$WH_WINETRICKS" -q "$@" ;;
     desktop) create_desktop "$@" ; exit 0 ;;
     install|-i) run_autoinstall "$@" ;;
@@ -2662,15 +2663,16 @@ case "$arg1" in
             if [[ -n "$1" ]] && [[ -f "$1" ]] ; then
                 WIN_OPEN_FILE="$("$WINELOADER" winepath -w "$1")"
                 shift
+                wine_run "$WIN_FILE_EXEC" "$@" "$WIN_OPEN_FILE"
+            else
+                wine_run "$WIN_FILE_EXEC" "$@"
             fi
-
-            wine_run "$WIN_FILE_EXEC" "$@" "$WIN_OPEN_FILE"
         else
             print_error "Команды $arg1 не существует."
             wh_info
             exit 1
         fi
-    ;;
+        ;;
 esac
 
 if [[ -n "$WH_BG_PID" ]] ; then