From 0c14c4684bbb17589fe7d86d006575bc259c9ec9 Mon Sep 17 00:00:00 2001 From: VHSgunzo Date: Mon, 1 Jul 2024 12:26:54 +0300 Subject: [PATCH] v0.78.5.1 --- CHANGELOG.md | 8 ++++++++ db/TimeShift.lwdb | 1 + db/prototypef.lwdb | 1 + lux-wine | 20 ++++++++++---------- lwrap/PKGBUILD | 4 ++-- lwrap/lwrap | 7 +++++-- 6 files changed, 27 insertions(+), 14 deletions(-) create mode 120000 db/prototypef.lwdb diff --git a/CHANGELOG.md b/CHANGELOG.md index ca3f6ad..b2590eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v0.78.5.1 + +* Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages +* Update [GE-Proton](https://github.com/VHSgunzo/ge-proton-lw/releases/tag/v9.9) `v9.9` +* Add grep CHK_UPDATE from LW global config to lwrap +* Add DB script for `Prototype` +* Minor fixes + # v0.78.4.9 * Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages diff --git a/db/TimeShift.lwdb b/db/TimeShift.lwdb index 7095325..5dc6e22 100644 --- a/db/TimeShift.lwdb +++ b/db/TimeShift.lwdb @@ -1,3 +1,4 @@ #DB# TimeShift # DB_EXES=('TimeShift.exe') +#DB# Prototype # DB_EXES=('prototypef.exe') CPU_LIMIT='8' diff --git a/db/prototypef.lwdb b/db/prototypef.lwdb new file mode 120000 index 0000000..0cefea0 --- /dev/null +++ b/db/prototypef.lwdb @@ -0,0 +1 @@ +TimeShift.lwdb \ No newline at end of file diff --git a/lux-wine b/lux-wine index 2024182..946d2c8 100755 --- a/lux-wine +++ b/lux-wine @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export LW_VERSION="0.78.4.9" +export LW_VERSION="0.78.5.1" export LW_DEVELOPERS="VHSgunzo" export RED='\033[1;91m' @@ -106,7 +106,7 @@ for icon in "$LW_ICONS_DIR"/*.png do mkdir -p "$HOME_ICONS/hicolor/$hi_icon_size/apps" mkdir -p "$LW_ICONS_DIR/hicolor/$hi_icon_size/apps" - convert "$icon" -resize "$hi_icon_size" \ + magick "$icon" -resize "$hi_icon_size" \ "$LW_ICONS_DIR/hicolor/$hi_icon_size/apps/$icon_name" && \ ln -sfr "$LW_ICONS_DIR/hicolor/$hi_icon_size/apps/$icon_name" \ "$HOME_ICONS/hicolor/$hi_icon_size/apps/$icon_name" @@ -778,7 +778,7 @@ try_download() { try_mkdir "$DLPTH" if [ "$LW_DOWNLOADER" == "aria2c" ] then - aria2c -x 13 -s 13 --allow-overwrite --summary-interval=1 -o "$DLFLNAME" -d "$DLPTH" "$1"|stdbuf -o0 grep 'ETA'| \ + aria2c -x 13 -s 13 --no-conf --allow-overwrite --summary-interval=1 -o "$DLFLNAME" -d "$DLPTH" "$1"|stdbuf -o0 grep 'ETA'| \ sed -u 's/(.*)/ &/;s/(//;s/)//;s/\[//;s/\]//;s/%//'|stdbuf -o0 awk '{print$3"\n#Downloading at "$2,$5,$6}'| \ yad --progress --percentage=0 --text="Download:\t$DLFLNAME\n$1" --auto-close --no-escape --selectable-labels \ --auto-kill --center --on-top --fixed --no-buttons --undecorated --skip-taskbar Lux Wine @@ -1485,7 +1485,7 @@ exe2png() { done) fi } - if is_exe_exist icoextract && is_exe_exist convert + if is_exe_exist icoextract && is_exe_exist magick then HICOLOR_SHR_DIR="$SHRT_PATH/hicolor_icons" if [[ -f "$SHRT_PATH/${SHRT_NAME}.png" && \ @@ -1510,7 +1510,7 @@ exe2png() { then exe_ico="$(ls -S -1 "${SHRT_NAME}"*_*_123.ico)" else exe_ico="$(ls -S -1 "${SHRT_NAME}"*.ico 2>/dev/null|head -1)" fi - convert "$exe_ico" "$(echo "$exe_ico"|sed 's|.ico$|.png|gi')" + magick "$exe_ico" "$(echo "$exe_ico"|sed 's|.ico$|.png|gi')" if [ ! -f "${SHRT_NAME}.png" ] then if [ "${SHRT_NAME}" == "osu!" ] @@ -1524,7 +1524,7 @@ exe2png() { for hi_icon_size in ${HICOLOR_SIZES[@]} do try_mkdir "$hi_icon_size/apps" - convert "../${SHRT_NAME}.png" -resize "$hi_icon_size" \ + magick "../${SHRT_NAME}.png" -resize "$hi_icon_size" \ "$hi_icon_size/apps/${SHRT_NAME}.png" done) add_exe_icon @@ -1958,6 +1958,7 @@ import_luwine_wcfg() { source "$LW_CFG" set +a set_wine_version + [ "$NO_UPD_CHKSUM" == 1 ]||\ updcfgchksum } @@ -2423,7 +2424,6 @@ check_exe_wcfg_cenv() { then print_info notify "Found EXE config!" print_info "Path: '$EXE_CFG'" - sed -i "s|$OLD_LW_DIR|$LW_DIR|g" "$EXE_CFG" 2>/dev/null if [ -f "$LW_DEF_CFG" ] then export LW_CFG="$EXE_CFG" @@ -3579,7 +3579,7 @@ lu_exit() { check_config_only() { QUIET_MODE=1 check_exe_wcfg_cenv "$@" - check_luwine_wcfg_cenv + NO_UPD_CHKSUM=1 check_luwine_wcfg_cenv check_def_config } @@ -5442,7 +5442,6 @@ check_winepfx() { DEF_WDESK_DIR=("Desktop" "Documents" "Music" "Videos" "Pictures" "Downloads" "Templates") (IFS=$'\n' ; for WINEDESK_DIR in "${DEF_WDESK_DIR[@]}" do - XDGUSERDIRPTH="$HOME/$WINEDESK_DIR" WDESKDIRPTH="$WPFX_STEAMUSER_DIR/$WINEDESK_DIR" if [ "$WINE_SANDBOX" == 1 ] then @@ -5457,6 +5456,7 @@ check_winepfx() { fi else DESKLNK="$(readlink -f "$WDESKDIRPTH")" + XDGUSERDIRPTH="$HOME/$WINEDESK_DIR" if [ "$DESKLNK" != "$XDGUSERDIRPTH" ] then if [[ ! -L "$WDESKDIRPTH" && -d "$WDESKDIRPTH" ]] @@ -5466,7 +5466,7 @@ check_winepfx() { then try_rm "$WDESKDIRPTH" fi - [ ! -d "$WDESKDIRPTH" ] && \ + [[ -d "$XDGUSERDIRPTH" && ! -d "$WDESKDIRPTH" ]] && \ try_ln "$XDGUSERDIRPTH" "$WDESKDIRPTH" fi fi diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD index c0310b5..548df13 100644 --- a/lwrap/PKGBUILD +++ b/lwrap/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: VHSgunzo pkgname='lwrap' -pkgver='0.78.4' -pkgrel='9' +pkgver='0.78.5' +pkgrel='1' pkgdesc='Lux Wine wrapper for RunImage container' arch=('x86_64') url='https://github.com/VHSgunzo/lux-wine' diff --git a/lwrap/lwrap b/lwrap/lwrap index ba8014d..a015b90 100755 --- a/lwrap/lwrap +++ b/lwrap/lwrap @@ -1,8 +1,6 @@ #!/usr/bin/env bash # Lux Wine wrapper for RunImage container -CHK_UPDATE='3' - shopt -s extglob RED='\033[1;91m' @@ -74,6 +72,11 @@ if [[ -n "$RUNSRC" && -d "$RUNROOTFS" ]] && \ fi unset NO_EXT_LWRAP +CFG_CHK_UPDATE="$(grep '^CHK_UPDATE=.*$' "$LW_CFG" 2>/dev/null)" +[ -n "$CFG_CHK_UPDATE" ] && \ +eval "$CFG_CHK_UPDATE"||\ +CHK_UPDATE='3' + [ ! -n "$(tty|grep -v 'not a'|grep -Eo 'tty|pts')" ] && \ NOT_TERM=1||NOT_TERM=0