diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 21536acd265406ab3503e50e762fbcb1f67865a4..bc6bcef137bdd9c529d9744b8bbec75fcef59f6d 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2172### +* minor improvements searching the .exe files + ###Scripts version 2171### * all shortcuts created in the PortProton directory are automatically added to the "INSTALLED" tab item with which you can launch installed games and applications from PortProton itself * the menu tab "INSTALLED" is automatically transferred as the main (first) tab in PortProton, if you already have shortcuts to installed games or programs diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index bffc213af24229f6f6cfcf5fb8fd45ae8cfbd986..48223bf98b48466fdb72f0d984b42bb3c0f929b1 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- Рстория изменений: +###Scripts version 2172### +* небольшие улучшения РїРѕРёСЃРєР° .exe файлов + ###Scripts version 2171### * РІ РїСѓРЅРєС‚ меню "УСТАНОВЛЕННЫЕ" автоматически добавляются РІСЃРµ ярлыки созданные РІ каталоге PortProton СЃ помощью которых РІС‹ можете запускать установленные РёРіСЂС‹ Рё приложения РёР· самого PortProton * РїСѓРЅРєС‚ меню "УСТАНОВЛЕННЫЕ" автоматически переноситься как главная (первая) вкладка РІ PortProton, если Сѓ вас уже есть ярлыки установленных РёРіСЂ или программ diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 2f1797982ad1adfd2ea5c91f962074352690a9c7..9d53b4fa29d69b218eaba74a9ef3e06a3ef522d2 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -978,17 +978,20 @@ pw_find_exe () { PW_EXCLUDE_EXE_FIND='(windows|explorer|anticheat|programdata|redist|setup|.ppdb|unin|error|crash|handler|install|/jre/|steam|uploader|eac|netframe)' PW_PATH_FOR_FIND="${PORT_WINE_PATH}/data/prefixes/" - find -P "${PW_PATH_FOR_FIND}" -type f -name "*.exe" ${PW_FIND_TIME} | grep -viE ${PW_EXCLUDE_EXE_FIND} | awk -F"/prefixes/" '{print $2}' > "${PORT_WINE_TMP_PATH}/tmp_yad_find_exe" + pw_start_progress_bar_block "Searching for .exe files... Please wait." + find -P "${PW_PATH_FOR_FIND}" -type f -name "*.exe" ${PW_FIND_TIME} | grep -viE ${PW_EXCLUDE_EXE_FIND} | \ + awk -F"/prefixes/" '{print $2}' > "${PORT_WINE_TMP_PATH}/tmp_yad_find_exe" + pw_stop_progress_bar unset FIND_TO_GUI while read line; do - FIND_TO_GUI+="false%${line}%" + FIND_TO_GUI+="${line}%" done < "${PORT_WINE_TMP_PATH}/tmp_yad_find_exe" OrigIFS="$IFS" && IFS=% - PW_SET_FIND_EXE="$("${pw_yad_new}" --height="300" --width="1000" --center --list --radiolist \ + PW_SET_FIND_EXE="$("${pw_yad_new}" --height="300" --width="1000" --center --list \ --text-align=center --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "Create shortcut for..." \ - --text="\n${loc_gui_create_shortcut_for_exe}" --column="set:" --column="path to .exe file:" ${FIND_TO_GUI})" + --text="\n${loc_gui_create_shortcut_for_exe}" --column="path to .exe file:" ${FIND_TO_GUI})" YAD_STATUS="$?" print_var YAD_STATUS if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" || -z "${PW_SET_FIND_EXE}" ]] ; then @@ -998,8 +1001,8 @@ pw_find_exe () { IFS=$OrigIFS if [[ -n "${PW_SET_FIND_EXE}" ]] ; then - portwine_exe="${PW_PATH_FOR_FIND}$(echo "${PW_SET_FIND_EXE}" | awk -F'|' '{print $2}')" - portwine_create_shortcut + portwine_exe="${PW_PATH_FOR_FIND}$(echo "${PW_SET_FIND_EXE}" | awk -F'|' '{print $1}')" + portwine_create_shortcut silent /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 fi diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 244f59cf0232267a8d8e80c12c8056bebb55ab8c..f6ae465b84020e194edb8398b7aefe264c866124 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2171 +#SCRIPTS_NEXT_VERSION=2172 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 83cdb383a3d8bf40e407af2d8a68787a6f5570bf..47a02885a4ab6d08ccc572ec9edd39822eacdd71 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -487,7 +487,7 @@ portwine_create_shortcut () { cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" "${HOME}/Рабочий стол/" fi fi - xdg-open "${PORT_WINE_PATH}" 2>1 >/dev/null & + [[ "$1" != silent ]] && xdg-open "${PORT_WINE_PATH}" 2>1 >/dev/null & } portwine_delete_shortcut () {