22export ENVKEY=$RANDOM
33export > /tmp/envbackup$ENVKEY
44export LW_DEVELOPERS=" VHSgunzo"
5- export LW_VERSION=" 0.61 "
5+ export LW_VERSION=" 0.62 "
66
77export BLUE=' \033[1;94m'
88export RED=' \033[1;91m'
@@ -179,7 +179,7 @@ init_def_config() {
179179 fi
180180 if [ -z " $VKBASALT_EFFECTS " ]
181181 then
182- export VKBASALT_EFFECTS=" cas"
182+ export VKBASALT_EFFECTS=" cas:Colourfulness:Tonemap "
183183 fi
184184 if [ -z " $VKBASALT_FFX_CAS " ]
185185 then
@@ -1624,7 +1624,7 @@ check_def_wine() {
16241624 else
16251625 check_def_wine
16261626 fi
1627- elif [[ ! -f " $WINE " && " $( ls -1 " $LW_WINE_DIR " 2> /dev/null| sed ' s/^ *//g' | wc -l) " != 1 ]] && [[ " $PLU_INST " == 1 || " $PGE_INST " == 1 || " $PK4_INST " == 1 ]]
1627+ elif [[ ! -f " $WINE " && " $( ls -1 " $LW_WINE_DIR " 2> /dev/null| sed ' s/^ *//g' | wc -l) " != 1 ]] && [[ " $PLU_INST " == 1 || " $PGE_INST " == 1 || " $WGE_INST " == 1 || " $ PK4_INST" == 1 ]]
16281628 then
16291629 print_error yad " Wine Manager" " Default Wine not selected, you must select default Wine!"
16301630 SETWINE=" $( echo -e " \n$( echo " $( ls " $LW_WINE_DIR " ) $( if [ ! -z " $SYS_WINE " ]; then echo -e ' \nSystem' ; fi) " | sed ' :a;N;$!ba;s/\n/\n\n/g' ) " | \
@@ -1641,9 +1641,9 @@ check_def_wine() {
16411641 else
16421642 check_def_wine
16431643 fi
1644- elif [[ -f " $WINE " && " $( ls -1 " $LW_WINE_DIR " 2> /dev/null| sed ' s/^ *//g' | wc -l) " == 1 && " $WINE_VERSION " != " System" ]] && [[ " $PLU_INST " == 1 || " $PGE_INST " == 1 || " $PK4_INST " == 1 ]]
1644+ elif [[ -f " $WINE " && " $( ls -1 " $LW_WINE_DIR " 2> /dev/null| sed ' s/^ *//g' | wc -l) " == 1 && " $WINE_VERSION " != " System" ]] && [[ " $PLU_INST " == 1 || " $PGE_INST " == 1 || " $WGE_INST " == 1 || " $ PK4_INST" == 1 ]]
16451645 then :
1646- elif [[ ! -f " $WINE " && " $( ls -1 " $LW_WINE_DIR " 2> /dev/null| sed ' s/^ *//g' | wc -l) " == 1 ]] && [[ " $PLU_INST " == 1 || " $PGE_INST " == 1 || " $PK4_INST " == 1 ]]
1646+ elif [[ ! -f " $WINE " && " $( ls -1 " $LW_WINE_DIR " 2> /dev/null| sed ' s/^ *//g' | wc -l) " == 1 ]] && [[ " $PLU_INST " == 1 || " $PGE_INST " == 1 || " $WGE_INST " == 1 || " $ PK4_INST" == 1 ]]
16471647 then
16481648 export SETWINE=" $( ls -1 " $LW_WINE_DIR " 2> /dev/null| head -1) "
16491649 sed -i " s/export WINE_VERSION.*/export WINE_VERSION=\'$SETWINE \'/g" " $LW_CFG "
@@ -1652,7 +1652,7 @@ check_def_wine() {
16521652 export OLD_WINE=" $WINE "
16531653 import_luwine_conf
16541654 print_info yad " Wine Manager" " Wine $SETWINE selected as default!"
1655- elif [[ " $PLU_INST " == 1 || " $PGE_INST " == 1 || " $PK4_INST " == 1 ]]
1655+ elif [[ " $PLU_INST " == 1 || " $PGE_INST " == 1 || " $WGE_INST " == 1 || " $ PK4_INST" == 1 ]]
16561656 then
16571657 if [ -z " $( pgrep -fa yad| grep " Wine Manager" | awk ' {print$1}' ) " ]
16581658 then
@@ -2508,15 +2508,15 @@ winetricks() {
25082508 then
25092509 if [ ! -z " $( which winetricks 2> /dev/null) " ]
25102510 then
2511- print_info " Using SYSTEM winetricks!"
2511+ print_info " Using System winetricks!"
25122512 " $( which winetricks) " " $@ "
25132513 else
2514- print_error yad " Winetricks" " Winetricks not found in your system. Using LUTRIS winetricks!"
2514+ print_error yad " Winetricks" " Winetricks not found in your system. Using Lutris Wine winetricks!"
25152515 check_winetricks
25162516 " $WTRX_DIR /winetricks" " $@ "
25172517 fi
25182518 else
2519- print_info " Using LUTRIS winetricks!"
2519+ print_info " Using Lutris Wine winetricks!"
25202520 check_winetricks
25212521 " $WTRX_DIR /winetricks" " $@ "
25222522 fi
@@ -2964,31 +2964,34 @@ lu_winemgr() {
29642964 GREPWARCHURL=" grep -iE ' (.tar.gz|.tar.xz|.tar.zst)' | grep -v ' tags' | grep ' href' | sed ' s/.*releases//g' | cut -d' \"' -f1"
29652965 PLU_GIT=" https://github.com/lutris/wine/releases"
29662966 PGE_GIT=" https://github.com/GloriousEggroll/proton-ge-custom/releases"
2967+ WGE_GIT=" https://github.com/GloriousEggroll/wine-ge-custom/releases"
29672968 PK4_GIT=" https://github.com/Kron4ek/Wine-Builds/releases"
29682969 curl -s " $PLU_GIT " |eval " $GREPWARCHURL " |awk '{print " ' $PLU_GIT' " $0 }' 1> " /tmp/PLUGITLIST$WGUIDW " &
29692970 curl -s " $PGE_GIT " |eval " $GREPWARCHURL " |awk '{print " ' $PGE_GIT' " $0 }' 1> " /tmp/PGEGITLIST$WGUIDW " &
2971+ curl -s " $WGE_GIT " |eval " $GREPWARCHURL " |awk '{print " ' $WGE_GIT' " $0 }' 1> " /tmp/WGEGITLIST$WGUIDW " &
29702972 curl -s " $PK4_GIT " |eval " $GREPWARCHURL " |awk '{print " ' $PK4_GIT' " $0 }' 1> " /tmp/PK4GITLIST$WGUIDW " &
29712973 while true
29722974 do
29732975 sleep 0.2
2974- export GITLISTOK=0
2975- for curlgit in $PLU_GIT $PGE_GIT $PK4_GIT
2976+ GITLISTOK=0
2977+ for curlgit in $PLU_GIT $PGE_GIT $WGE_GIT $ PK4_GIT
29762978 do
29772979 echo
29782980 sleep 0.2
29792981 if [ -z " $( pgrep -fa curl| grep -o " $curlgit " ) " ]
29802982 then
29812983 GITLISTOK=$(( $GITLISTOK + 1 ))
29822984 fi
2983- if [ " $GITLISTOK " == 3 ]; then break; fi
2985+ if [ " $GITLISTOK " == 4 ]; then break; fi
29842986 done
2985- if [ " $GITLISTOK " == 3 ]; then break; fi
2987+ if [ " $GITLISTOK " == 4 ]; then break; fi
29862988 done|settingbar_nostdout
29872989 PLU_GIT_LIST=" $( cat /tmp/PLUGITLIST$WGUIDW 2> /dev/null ; try_rm /tmp/PLUGITLIST$WGUIDW ) "
29882990 PGE_GIT_LIST=" $( cat /tmp/PGEGITLIST$WGUIDW 2> /dev/null ; try_rm /tmp/PGEGITLIST$WGUIDW ) "
2991+ WGE_GIT_LIST=" $( cat /tmp/WGEGITLIST$WGUIDW 2> /dev/null ; try_rm /tmp/WGEGITLIST$WGUIDW ) "
29892992 PK4_GIT_LIST=" $( cat /tmp/PK4GITLIST$WGUIDW 2> /dev/null ; try_rm /tmp/PK4GITLIST$WGUIDW ) "
29902993 fi
2991- if [[ ! -z " $PLU_GIT_LIST " || ! -z " $PGE_GIT_LIST " || ! -z " $PK4_GIT_LIST " ]]
2994+ if [[ ! -z " $PLU_GIT_LIST " || ! -z " $PGE_GIT_LIST " || ! -z " $WGE_GIT_LIST " || ! -z " $PK4_GIT_LIST " ]]
29922995 then
29932996 export GITOK=" 1"
29942997 print_info " Сhecking new WINE versions on GitHub complete! "
@@ -3000,23 +3003,26 @@ lu_winemgr() {
30003003 then
30013004 PLU_LIST="$(echo -e "$(for PLUGIT in $PLU_GIT_LIST ; do echo $PLUGIT|awk -F/ ' {print $NF }' |sed ' s/.tar.xz//' ; done)" "\n$ILW_LIST"|sort|uniq -u|grep -v "$ILW_LIST")"
30023005 PGE_LIST="$(echo -e "$(for PGEGIT in $PGE_GIT_LIST ; do echo $PGEGIT|awk -F/ ' {print $NF }' |sed ' s/.tar.gz//' ; done|sed ' /Proton-6.5-GE-2/,$d ' |sed ' /github-action/d' )" "\n$ILW_LIST"|sort|uniq -u|grep -v "$ILW_LIST")"
3006+ WGE_LIST="$(echo -e "$(for WGEGIT in $WGE_GIT_LIST ; do echo $WGEGIT|awk -F/ ' {print $NF }' |sed ' s/.tar.xz//' ; done)" "\n$ILW_LIST"|sort|uniq -u|grep -v "$ILW_LIST")"
30033007 PK4_LIST="$(echo -e "$(for PK4GIT in $PK4_GIT_LIST ; do echo $PK4GIT|awk -F/ ' {print $NF }' |sed ' s/.tar.xz//' ; done|sed ' /-x86/d' )" "\n$ILW_LIST"|sort|uniq -u|grep -v "$ILW_LIST")"
30043008 echo -e "\n$(echo "$PLU_LIST"|sed ' :a; N; $! ba; s/\n /\n\n /g' )"|yad --plug=$WGUIDW --tabnum=1 --list --column="" --checklist --separator=" " --column "Select WINE for download:" 1> "/tmp/PLUSET$WGUIDW" &
30053009 echo -e "\n$(echo "$PGE_LIST"|sed ' :a; N; $! ba; s/\n /\n\n /g' )"|yad --plug=$WGUIDW --tabnum=2 --list --column="" --checklist --separator=" " --column "Select WINE for download:" 1> "/tmp/PGESET$WGUIDW" &
3006- echo -e "\n$(echo "$PK4_LIST"|sed ' :a; N; $! ba; s/\n /\n\n /g' )"|yad --plug=$WGUIDW --tabnum=3 --list --column="" --checklist --separator=" " --column "Select WINE for download:" 1> "/tmp/PK4SET$WGUIDW" &
3007- echo -e "\n$(echo "$ILW_LIST"|sed ' :a; N; $! ba; s/\n /\n\n /g' )"|yad --plug=$WGUIDW --tabnum=4 --list --column="" --checklist --separator=" " --column "Select installed WINE for delete:" 1> "/tmp/WDEL_SET$WGUIDW" &
3010+ echo -e "\n$(echo "$WGE_LIST"|sed ' :a; N; $! ba; s/\n /\n\n /g' )"|yad --plug=$WGUIDW --tabnum=3 --list --column="" --checklist --separator=" " --column "Select WINE for download:" 1> "/tmp/WGESET$WGUIDW" &
3011+ echo -e "\n$(echo "$PK4_LIST"|sed ' :a; N; $! ba; s/\n /\n\n /g' )"|yad --plug=$WGUIDW --tabnum=4 --list --column="" --checklist --separator=" " --column "Select WINE for download:" 1> "/tmp/PK4SET$WGUIDW" &
3012+ echo -e "\n$(echo "$ILW_LIST"|sed ' :a; N; $! ba; s/\n /\n\n /g' )"|yad --plug=$WGUIDW --tabnum=5 --list --column="" --checklist --separator=" " --column "Select installed WINE for delete:" 1> "/tmp/WDEL_SET$WGUIDW" &
30083013 yad --key=$WGUIDW --notebook --width=500 --height=600 --text-align=center --center \
30093014 --window-icon="$DEF_ICO" --title "Wine Manager" --separator="" \
3010- --tab-pos=top --tab="Lutris" --tab="GloriousEggroll " --tab="Kron4ek" --tab="DELETE" --button="EXIT:1" --button="OK:0"
3015+ --tab-pos=top --tab="Lutris" --tab="Proton GE" --tab="Wine GE " --tab="Kron4ek" --tab="DELETE" --button="EXIT:1" --button="OK:0"
30113016 PLU_SET="$(sed ' s/TRUE //g' /tmp/PLUSET$WGUIDW 2>/dev/null ; try_rm /tmp/PLUSET$WGUIDW)"
30123017 PGE_SET="$(sed ' s/TRUE //g' /tmp/PGESET$WGUIDW 2>/dev/null ; try_rm /tmp/PGESET$WGUIDW)"
3018+ WGE_SET="$(sed ' s/TRUE //g' /tmp/WGESET$WGUIDW 2>/dev/null ; try_rm /tmp/WGESET$WGUIDW)"
30133019 PK4_SET="$(sed ' s/TRUE //g' /tmp/PK4SET$WGUIDW 2>/dev/null ; try_rm /tmp/PK4SET$WGUIDW)"
30143020 WDEL_SET="$(sed ' s/TRUE //g' /tmp/WDEL_SET$WGUIDW 2>/dev/null ; try_rm /tmp/WDEL_SET$WGUIDW)"
30153021 elif [[ ! -z "$ILW_LIST" && -z "$GITOK" ]]
30163022 then
30173023 if [[ "$(echo "$ILW_LIST"|sed ' s/^ * //g' |wc -l)" == 1 && "$ILW_LIST" == "$WINE_IN_USE" ]]
30183024 then
3019- print_error yad "Wine Manager" "Lutris has one WINE installed and it selected by default! Can' t run Wine Manager! "
3025+ print_error yad "Wine Manager" "Lutris Wine has one WINE installed and it selected by default! Can' t run Wine Manager! "
30203026 exit 1
30213027 else
30223028 echo -e " \n $( echo " $ILW_LIST " | grep -wv " $WINE_IN_USE " 2> /dev/null| sed ' :a;N;$!ba;s/\n/\n\n/g' ) " |yad --plug=$WGUIDW --tabnum=1 --list --column=" " --checklist --separator=" " --column " Select installed WINE for delete:" 1> " /tmp/WDEL_SET$WGUIDW " &
@@ -3032,12 +3038,14 @@ lu_winemgr() {
30323038 PK4_LIST=" $( for PK4GIT in $PK4_GIT_LIST ; do echo $PK4GIT | awk -F/ ' {print $NF}' | sed ' s/.tar.xz//' ; done| sed ' /-x86/d' ) "
30333039 echo -e " \n $( echo " $PLU_LIST " | sed ' :a;N;$!ba;s/\n/\n\n/g' ) " |yad --plug=$WGUIDW --tabnum=1 --list --column=" " --checklist --separator=" " --column " Select WINE for download:" 1> " /tmp/PLUSET$WGUIDW " &
30343040 echo -e " \n $( echo " $PGE_LIST " | sed ' :a;N;$!ba;s/\n/\n\n/g' ) " |yad --plug=$WGUIDW --tabnum=2 --list --column=" " --checklist --separator=" " --column " Select WINE for download:" 1> " /tmp/PGESET$WGUIDW " &
3035- echo -e " \n $( echo " $PK4_LIST " | sed ' :a;N;$!ba;s/\n/\n\n/g' ) " |yad --plug=$WGUIDW --tabnum=3 --list --column=" " --checklist --separator=" " --column " Select WINE for download:" 1> " /tmp/PK4SET$WGUIDW " &
3041+ echo -e " \n $( echo " $WGE_LIST " | sed ' :a;N;$!ba;s/\n/\n\n/g' ) " |yad --plug=$WGUIDW --tabnum=3 --list --column=" " --checklist --separator=" " --column " Select WINE for download:" 1> " /tmp/WGESET$WGUIDW " &
3042+ echo -e " \n $( echo " $PK4_LIST " | sed ' :a;N;$!ba;s/\n/\n\n/g' ) " |yad --plug=$WGUIDW --tabnum=4 --list --column=" " --checklist --separator=" " --column " Select WINE for download:" 1> " /tmp/PK4SET$WGUIDW " &
30363043 yad --key=$WGUIDW --notebook --width=500 --height=600 --text-align=center --center \
30373044 --window-icon=" $DEF_ICO " --title " Wine Manager" --separator=" " \
30383045 --tab-pos=top --tab=" Lutris" --tab=" GloriousEggroll" --tab=" Kron4ek"
30393046 PLU_SET=" $( sed ' s/TRUE //g' /tmp/PLUSET$WGUIDW 2> /dev/null ; try_rm /tmp/PLUSET$WGUIDW ) "
30403047 PGE_SET=" $( sed ' s/TRUE //g' /tmp/PGESET$WGUIDW 2> /dev/null ; try_rm /tmp/PGESET$WGUIDW ) "
3048+ WGE_SET=" $( sed ' s/TRUE //g' /tmp/WGESET$WGUIDW 2> /dev/null ; try_rm /tmp/WGESET$WGUIDW ) "
30413049 PK4_SET=" $( sed ' s/TRUE //g' /tmp/PK4SET$WGUIDW 2> /dev/null ; try_rm /tmp/PK4SET$WGUIDW ) "
30423050 elif [[ -z " $ILW_LIST " && -z " $GITOK " ]]
30433051 then
@@ -3121,6 +3129,40 @@ lu_winemgr() {
31213129 fi
31223130 done
31233131 fi
3132+ if [ ! -z "$(echo "$WGE_SET"|head -1)" ]
3133+ then
3134+ for WGE_DW in $WGE_SET
3135+ do
3136+ unset WGE_DW_URL
3137+ export WGE_DW_URL="$(echo "$WGE_GIT_LIST"|grep $WGE_DW)"
3138+ if [ ! -z "$WGE_DW_URL" ]
3139+ then
3140+ print_info "Download and install $WGE_DW"
3141+ if try_download "$WGE_DW_URL" "$LW_WINE_DIR"
3142+ then
3143+ for archive_type in "gz" "xz"
3144+ do
3145+ if [ -f "$LW_WINE_DIR/${WGE_DW}.tar.${archive_type}" ]
3146+ then
3147+ if unpack_tar_${archive_type} "$LW_WINE_DIR/${WGE_DW}.tar.${archive_type}" "$LW_WINE_DIR/"
3148+ then
3149+ export WGE_INST="1"
3150+ try_rm "$LW_WINE_DIR/${WGE_DW}.tar.${archive_type}"
3151+ print_info "Installing $WGE_DW complete!"
3152+ else
3153+ try_rm "$LW_WINE_DIR/${WGE_DW}.tar.${archive_type}"
3154+ try_rm "$LW_WINE_DIR/${WGE_DW}"
3155+ download_error && lu_winemgr
3156+ fi
3157+ fi
3158+ done
3159+ else
3160+ try_rm "$LW_WINE_DIR/${WGE_DW}.tar.${archive_type}"
3161+ download_error && lu_winemgr
3162+ fi
3163+ fi
3164+ done
3165+ fi
31243166 if [ ! -z "$(echo "$PK4_SET"|head -1)" ]
31253167 then
31263168 for PK4_DW in $PK4_SET
@@ -3183,14 +3225,14 @@ lu_winemgr() {
31833225 print_info yad "Wine remove" "Wine removing completed!"
31843226 fi
31853227 fi
3186- if [[ "$PLU_INST" == 1 || "$PGE_INST" == 1 || "$PK4_INST" == 1 ]]
3228+ if [[ "$PLU_INST" == 1 || "$PGE_INST" == 1 || "$WGE_INST" == 1 || "$ PK4_INST" == 1 ]]
31873229 then
31883230 if [ -z "$WINEINUSEDEL" ]
31893231 then
31903232 check_def_wine
31913233 unset WDEL_SET
31923234 fi
3193- unset PLU_INST PK4_INST PGE_INST
3235+ unset PLU_INST PK4_INST PGE_INST WGE_INST
31943236 print_info yad "Wine Manager" "Wine installation completed!"
31953237 fi
31963238}
0 commit comments