Minor fix for settings.sh and runlib

2021-01-04 20:36:49 +03:00 · 2021-01-04 20:36:49 +03:00 · 62fa3a10de
commit 62fa3a10de
parent da12192090
4 changed files with 39 additions and 38 deletions
--- a/data_from_portwine/port_on
+++ b/data_from_portwine/port_on
@ -146,7 +146,7 @@ class CompatData:
                # "xinput*.dll," +

                # #vcruntime redist
-                # "atl1*.dll," +
+                "atl1*.dll," +
                # "concrt1*.dll," +
                # "msvcp1*.dll," +
                # "msvcr1*.dll," +
@ -160,7 +160,7 @@ class CompatData:
                # "api-ms-win-crt-math-l1-1-0.dll," +
                # "api-ms-win-crt-runtime-l1-1-0.dll," +
                # "api-ms-win-crt-stdio-l1-1-0.dll," +
-                # "ucrtbase.dll," +
+                "ucrtbase.dll," +

                #some games balk at ntdll symlink(?)
                "ntdll.dll," +
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@ -54,7 +54,7 @@ if [ ! -e "${PORT_WINE_TMP_PATH}/${portname}_ver" ]; then
 	echo "10" > "${PORT_WINE_TMP_PATH}/${portname}_ver"
 fi
 ########################################################################
-export pw_libs_ver="_v4"
+export pw_libs_ver="_v5"
 export port_on_run="${PORT_WINE_PATH}/data/port_on"
 export WINEDIR="${PORT_WINE_PATH}"/data/dist
 export WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}"
@ -99,6 +99,22 @@ if [ -f "${WINEDIR}"_vkd3d/version ]; then
    zen_width=1000
 fi
 ########################################################################
+if [ ! -e "${WINELIB}/run.sh" ]; then 
+    echo "Download and install libraries..."
+    wget -c -T 2 --output-document="${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" "${PW_FTP_URL}"/dist/libs${pw_libs_ver}.tar.xz | sszen &&
+    tar -Jxvf "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" -C "${HOME}/.PortWINE/" | sszen &&
+    rm -f "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz"
+    "${WINELIB}"/setup.sh --force
+fi
+if [ -e "${WINELIB}/run.sh" ]; then 
+    echo "######################################################"
+    echo "Runtime libraries is enabled"
+    pw_yad="${WINELIB}/usr/bin/yad"
+else
+    echo "######################################################"
+    echo "Runtime libraries is disabled"
+fi
+########################################################################
 START_PORTWINE ()
 {
 if [ "${PW_USE_TERMINAL}" = "1"  ]; then
@ -116,22 +132,6 @@ if [ "${PW_USE_TERMINAL}" = "1"  ]; then
 fi
 sh "${PORT_SCRIPTS_PATH}"/port_update 
 ########################################################################
-if [ ! -e "${WINELIB}/run.sh" ]; then 
-    echo "Download and install libraries..."
-    wget -c -T 2 --output-document="${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" "${PW_FTP_URL}"/dist/libs${pw_libs_ver}.tar.xz | sszen &&
-    tar -Jxvf "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" -C "${HOME}/.PortWINE/" | sszen &&
-    rm -f "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz"
-    "${WINELIB}"/setup.sh --force
-fi
-if [ -e "${WINELIB}/run.sh" ]; then 
-    echo "######################################################"
-    echo "Runtime libraries is enabled"
-#    "${PW_RUNTIME}" --print-steam-runtime-library-paths
-else
-    echo "######################################################"
-    echo "Runtime libraries is disabled"
-fi
-########################################################################
 if [ ! -z $dxvk_ogl_var ]; then
    var_dxvk_on="${dxvk_ogl_var}"
 else
@ -251,14 +251,14 @@ sed -i '/HKCR,steam\\shell\\open\\command/d' "${WINEDIR}"*/share/wine/wine.inf &
 rm -f  "${WINEDIR}"*/lib*/*steam* &&
 rm -f  "${WINEDIR}"*/lib*/wine/*steam* &&
 rm -f  "${WINEDIR}"*/lib*/wine/fakedlls/*steam* &&
-if [ ! -d "${WINEPREFIX}" ] || [ ! -d "${WINEPREFIX}"/dosdevices ] || [ ! -d "${WINEPREFIX}"/drive_c/windows ] || [ ! -f "${WINEPREFIX}"/system.reg ] || [ ! -f "${WINEPREFIX}"/user.reg ] || [ ! -f "${WINEPREFIX}"/userdef.reg ]; then
-    if [ ! -z "$(cat /etc/locale.gen | grep "^en_US.UTF-8")" ]; then 
-    export PW_LANG_OS="${LANG}"
-    export LANG=en_US.UTF-8
-    fi
-    $PW_TERM "${PW_RUNTIME}"  "${WINELOADER}" wineboot -u &&
-    export LANG="${PW_LANG_OS}"
-fi
+# if [ ! -d "${WINEPREFIX}" ] || [ ! -d "${WINEPREFIX}"/dosdevices ] || [ ! -d "${WINEPREFIX}"/drive_c/windows ] || [ ! -f "${WINEPREFIX}"/system.reg ] || [ ! -f "${WINEPREFIX}"/user.reg ] || [ ! -f "${WINEPREFIX}"/userdef.reg ]; then
+#     if [ ! -z "$(cat /etc/locale.gen | grep "^en_US.UTF-8")" ]; then 
+#     export PW_LANG_OS="${LANG}"
+#     export LANG=en_US.UTF-8
+#     fi
+#     $PW_TERM "${PW_RUNTIME}"  "${WINELOADER}" wineboot -u &&
+#     export LANG="${PW_LANG_OS}"
+# fi
 sed -i '/steamclient/d' "${WINEPREFIX}"/*.reg &&
 sed -i '/SteamPath/d' "${WINEPREFIX}"/*.reg &&

--- a/data_from_portwine/scripts/settings.sh
+++ b/data_from_portwine/scripts/settings.sh
@ -62,14 +62,15 @@ START_PORTWINE
 $PW_TERM "${PW_RUNTIME}" "${PORT_WINE_TMP_PATH}/winetricks" -q --force
 }
 ##########################
-OUTPUT=$(yad --form \
+OUTPUT=$("${pw_yad}"  --borders=20 --form --center  \
 --title "SETTINGS"  --image "winecfg" --separator=";" \
 --field="WINE:CB" "DXVK ${PW_WINE_VER_DXVK}"!"VKD3D ${PW_WINE_VER_VKD3D}" \
--button='WINECFG'!winecfg!"Run winecfg for $portname":100 \
--button='WINEFILE'!winecfg!'проверка подсказки1':102 \
--button='WINECMD'!winecfg!'проверка подсказки2':104 \
--button='WINEREG'!winecfg!'проверка подсказки3':106 \
--button='WINETRICKS'!winecfg!'проверка подсказки4 - бла бла бла бла бла ла ла ла =)':108 )
+--button='WINECFG'!!"Run winecfg for $portname":100 \
+--button='WINEFILE'!!'проверка подсказки1':102 \
+--button='WINECMD'!!'проверка подсказки2':104 \
+--button='WINEREG'!!'проверка подсказки3':106 \
+--button='WINETRICKS'!!'проверка подсказки4 - бла бла бла бла бла ла ла ла =)':108 )
+
 PW_YAD_SET="$?"
 export VULKAN_MOD=$(echo $OUTPUT | awk 'BEGIN {FS=";" } { print $1 }')
 if [ "${VULKAN_MOD}" = "DXVK ${PW_WINE_VER_DXVK}" ]; then
--- a/data_from_portwine/scripts/setup
+++ b/data_from_portwine/scripts/setup
@ -22,7 +22,7 @@ if [ ! -z "${gamename}" ]; then
 	name_desktop="${gamename}" 
 	echo "[Desktop Entry]"	 				  > "${PORT_WINE_PATH}/${name_desktop}.desktop"
 	echo "Name=${name_desktop}" 				 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-	echo "Exec=sh "${PORT_SCRIPTS_PATH}/start""	 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Exec=env "${PORT_SCRIPTS_PATH}/start""	 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
 	echo "Type=Application" 				 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
 	echo "Categories=Game"	    				 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
 	echo "StartupNotify=true" 	    			 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
@ -72,7 +72,7 @@ for name_desktop in "debug" "reset"
 do
 	echo ""[Desktop Entry]"
 	"Name=${name_desktop}"
-	"Exec=sh "${PORT_SCRIPTS_PATH}/${name_desktop}""
+	"Exec=env "${PORT_SCRIPTS_PATH}/${name_desktop}""
 	"Type=Application"
 	"Categories=Game"
 	"StartupNotify=true"
@ -81,10 +81,10 @@ do
 	chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
 done

-name_desktop="settings.sh"
-echo ""settings"
+name_desktop="settings"
+echo ""[Desktop Entry]"
 "Name=settings"
-"Exec=sh "${PORT_SCRIPTS_PATH}/${name_desktop}""
+"Exec=env "${PORT_SCRIPTS_PATH}/${name_desktop}.sh""
 "Type=Application"
 "Categories=Game"
 "StartupNotify=true"