diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 440d25d9..a1e31180 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2860,8 +2860,9 @@ pw_skip_get_info () { if [[ -f "${PW_TMPFS_PATH}/xrandr.tmp" ]] ; then PW_SCREEN_RESOLUTION="$(<"${PW_TMPFS_PATH}/xrandr.tmp" sed -rn 's/^.*primary.* ([0-9]+x[0-9]+).*$/\1/p')" PW_SCREEN_PRIMARY="$(grep -e 'primary' "${PW_TMPFS_PATH}/xrandr.tmp" | awk '{print $1}')" - export PW_SCREEN_PRIMARY PW_SCREEN_RESOLUTION fi + [[ $PW_SCREEN_RESOLUTION != *x* ]] && PW_SCREEN_RESOLUTION="1920x1080" + export PW_SCREEN_PRIMARY PW_SCREEN_RESOLUTION if [[ -f "${PW_TMPFS_PATH}/locale.tmp" ]] ; then GET_LOCALE_LIST="ru_RU.utf en_US.utf zh_CN.utf ja_JP.utf ko_KR.utf" @@ -5094,7 +5095,6 @@ gui_proton_downloader () { try_remove_file "${PW_TMPFS_PATH}/tmp_proton_sarek_git" try_remove_file "${PW_TMPFS_PATH}/tmp_proton_em_git" try_remove_file "${PW_TMPFS_PATH}/tmp_proton_ge_git" - try_remove_file "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" try_remove_file "${PW_TMPFS_PATH}/tmp_installed_wine" try_remove_file "${PW_TMPFS_PATH}/tmp_set_wine" @@ -5132,15 +5132,6 @@ gui_proton_downloader () { sed -i -e '/6.3/,$d' -e '/-x86/d' -e '/-wow64/d' -e '/^$/d' "${PW_TMPFS_PATH}/tmp_wine_kron4ek_git" fi - # WINE_GE_CUSTOM - read -r -d '' -a WINE_GE_CUSTOM < <(curl -s "https://api.github.com/repos/GloriousEggroll/wine-ge-custom/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4) - if [[ -n "${WINE_GE_CUSTOM[0]}" ]] ; then - for PGEGIT in "${WINE_GE_CUSTOM[@]}" ; do - echo "${PGEGIT}" | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" - done - sed -i -e '/6.23/,$d' -e '/^$/d' "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" - fi - # PROTON_LG read -r -d '' -a PROTON_PW_GIT < <(curl -s "https://api.github.com/repos/Castro-Fidel/wine_builds/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4 | sort -r) if [[ -n "${PROTON_PW_GIT[0]}" ]] ; then @@ -5185,7 +5176,7 @@ gui_proton_downloader () { for INSTALLING_VERSION_IN_DIST in * ; do sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PW_TMPFS_PATH}/tmp_proton_pw_git" \ "${PW_TMPFS_PATH}/tmp_proton_ge_git" "${PW_TMPFS_PATH}/tmp_wine_kron4ek_git" \ - "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" "${PW_TMPFS_PATH}/tmp_proton_sarek_git" \ + "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" "${PW_TMPFS_PATH}/tmp_proton_sarek_git" \ "${PW_TMPFS_PATH}/tmp_proton_em_git" done popd 1>/dev/null || fatal @@ -5193,7 +5184,6 @@ gui_proton_downloader () { TMP_PROTON_PW_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_pw_git" | tr '\n' ' ')" TMP_PROTON_GE_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_ge_git" | tr '\n' ' ')" TMP_PROTON_KR_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_wine_kron4ek_git" | tr '\n' ' ')" - TMP_PROTON_CU_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" | tr '\n' ' ')" TMP_PROTON_CACHYOS_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" | tr '\n' ' ')" TMP_PROTON_SAREK_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_sarek_git" | tr '\n' ' ')" TMP_PROTON_EM_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_em_git" | tr '\n' ' ')" @@ -5233,7 +5223,7 @@ gui_proton_downloader () { --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \ --column "${translations[Set]}" \ --column "${translations[Select WINE for download:]}" \ - $TMP_PROTON_CU_GIT \ + $TMP_PROTON_CACHYOS_GIT \ 1>> "${PW_TMPFS_PATH}/tmp_set_wine" \ 2>/dev/null & @@ -5241,7 +5231,7 @@ gui_proton_downloader () { --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \ --column "${translations[Set]}" \ --column "${translations[Select WINE for download:]}" \ - $TMP_PROTON_CACHYOS_GIT \ + $TMP_PROTON_SAREK_GIT \ 1>> "${PW_TMPFS_PATH}/tmp_set_wine" \ 2>/dev/null & @@ -5249,19 +5239,11 @@ gui_proton_downloader () { --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \ --column "${translations[Set]}" \ --column "${translations[Select WINE for download:]}" \ - $TMP_PROTON_SAREK_GIT \ - 1>> "${PW_TMPFS_PATH}/tmp_set_wine" \ - 2>/dev/null & - - "${pw_yad}" --plug=$KEY_WINE --tabnum=7 --list --checklist --separator="" \ - --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \ - --column "${translations[Set]}" \ - --column "${translations[Select WINE for download:]}" \ $TMP_PROTON_EM_GIT \ 1>> "${PW_TMPFS_PATH}/tmp_set_wine" \ 2>/dev/null & - "${pw_yad}" --plug=$KEY_WINE --tabnum=8 --list --checklist --separator="" \ + "${pw_yad}" --plug=$KEY_WINE --tabnum=7 --list --checklist --separator="" \ --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \ --column "${translations[Set]}" \ --column "${translations[Select installed WINE for delete:]}" \ @@ -5276,10 +5258,9 @@ gui_proton_downloader () { --tab="PROTON-LG!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ --tab="WINE-KRON4EK!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ --tab="PROTON-GE!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ - --tab="WINE-GE-CUSTOM!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ --tab="PROTON-CACHYOS!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ --tab="PROTON-SAREK!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ - --tab="Proton-EM!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ + --tab="PROTON-EM!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ --tab="${translations[INSTALLED]}!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ --button="${translations[CANCEL]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!":1 \ --button="${translations[OK]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!":0 2>/dev/null @@ -5350,7 +5331,7 @@ gui_proton_downloader () { if [[ "$1" != "silent" ]] ; then for GIVE_ALL_WINE in ${VERSION_WINE_GIT} ; do - for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]}" "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" "${PROTON_SAREK_GIT[@]}" "${PROTON_EM_GIT[@]}" ; do + for GIVE_WINE_URL in "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" "${PROTON_SAREK_GIT[@]}" "${PROTON_EM_GIT[@]}" ; do if [[ ${GIVE_WINE_URL^^} =~ ${GIVE_ALL_WINE^^}.TAR ]] ; then export URL_VERSION_PROTON_GIT=$GIVE_WINE_URL fi @@ -5361,7 +5342,7 @@ gui_proton_downloader () { restart_pp else print_error "$PW_WINE_USE" - for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]}" "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" "${PROTON_SAREK_GIT[@]}" "${PROTON_EM_GIT[@]}" ; do + for GIVE_WINE_URL in "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" "${PROTON_SAREK_GIT[@]}" "${PROTON_EM_GIT[@]}" ; do if [[ ${GIVE_WINE_URL^^} =~ ${PW_WINE_USE^^} ]] ; then export URL_VERSION_PROTON_GIT=$GIVE_WINE_URL fi