diff --git a/data_from_portwine/scripts/create_shortcut b/data_from_portwine/scripts/create_shortcut index 07f6deba..e8548c8c 100755 --- a/data_from_portwine/scripts/create_shortcut +++ b/data_from_portwine/scripts/create_shortcut @@ -14,12 +14,15 @@ fi PORTPROTON_IMG=$(zenity --file-selection --file-filter=""*.png" "*.ico"" \ --title="${sc_img}" --filename="${PORT_WINE_PATH}/data/img/") if [ $? -eq 1 ];then exit 1; fi +PORTPROTON_CMD="" +PORTPROTON_CMD=$(zenity --entry --text "${sc_cmd}") +if [ $? -eq 1 ];then exit 1; fi ######################################################################## cp -f "${PORTPROTON_IMG}" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" name_desktop="${PORTPROTON_NAME}" echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Name=${PORTPROTON_NAME}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" -echo "Exec="env export PATH_TO_GAME=\""$PORTPROTON_PATH"\" \&\& \"${PORT_WINE_PATH}/data/scripts/start\" \"${PORTPROTON_EXE}\""" \ +echo "Exec="env PATH_TO_GAME=\""$PORTPROTON_PATH"\" sh \"${PORT_WINE_PATH}/data/scripts/start\" \"${PORTPROTON_EXE}\" ${PORTPROTON_CMD}"" \ >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 67fb3741..2066d9ac 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -73,6 +73,7 @@ then export sc_name="Введите название будущего ярлыка:" export sc_path="Создаем ярлык. Выберите файл запуска..." export sc_img="Создаем ярлык. Выберите иконку ICO, или PNG формата..." + export sc_cmd="Введите дополнительные параметры запуска, или оставьте полепустым." elif [ "${update_loc}" = "ENG" ] then @@ -143,6 +144,7 @@ then export sc_name="Name shortcut:" export sc_path="Select the .exe file..." export sc_img="Select the .ICO or .PNG file..." + export sc_cmd="Add command line" fi diff --git a/data_from_portwine/scripts/vars b/data_from_portwine/scripts/vars index 32ad0abe..e642f977 100755 --- a/data_from_portwine/scripts/vars +++ b/data_from_portwine/scripts/vars @@ -5,7 +5,7 @@ export portname= export gamename= export gamedir= -if [ ! -z ${gamedir} ]; then +if [ ! -z "${gamedir}" ]; then export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/${gamedir}" fi export gamestart="${PATH_TO_GAME}/.exe" @@ -18,7 +18,7 @@ export PW_LOG=0 export PW_ACO=1 export PW_NO_VR=1 export PW_FILELOCK=1 -export PW_DXVK_ASYNC=1 +export PW_DXVK_ASYNC=0 export PW_USE_SECCOMP=0 export PW_NO_WINEMFPLAY=0 export PW_NVAPI_DISABLE=1 diff --git a/portwine_install_script/PortNAME-XX b/portwine_install_script/PortNAME-XX index 5ff069a2..b5360faf 100644 --- a/portwine_install_script/PortNAME-XX +++ b/portwine_install_script/PortNAME-XX @@ -13,7 +13,7 @@ clear && echo ' export gamedir="DIRNAME" export gamename="NAME" export portname="PortNAME" -export port_ver="XX" +export port_ver=XX ######################################################################## export PROGS_INST="" export vexit=0 @@ -96,7 +96,7 @@ export PORT_WINE_PATH="${D_PATH}" if [ ! -d "${PORT_WINE_PATH}" ];then mkdir -p "$PORT_WINE_PATH" else - for CLEAN_PORT in "dist" "libs" "tmp" "img" "scripts" "pfx/drive_c/windows" + for CLEAN_PORT in "dist" "libs" "tmp" "scripts" "pfx/drive_c/windows" do if [ -d "${PORT_WINE_PATH}/data/${CLEAN_PORT}" ];then rm -fR "${PORT_WINE_PATH}/data/${CLEAN_PORT}"