v0.78.5.4

VHSgunzo · Aug 24, 2024 · 1c13f50 · 1c13f50
1 parent 87afa09
commit 1c13f50
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v0.78.5.4
+
+* Remove `Yandex Cloud` mirrors
+
 # v0.78.5.3
 
 * Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages

diff --git a/README.md b/README.md
@@ -13,10 +13,6 @@ This project allows you to easily run your favorite applications and games for W
 ```
 curl -sL lwrap.github.io|bash
 ```
-* YC mirror:
-```
-curl -sL lwrap.website.yandexcloud.net|bash
-```
 * HF mirror:
 ```
 curl -sL lux-wine-git.static.hf.space|sed 1d|bash
@@ -26,10 +22,6 @@ curl -sL lux-wine-git.static.hf.space|sed 1d|bash
 ```
 wget -qO - lwrap.github.io|bash
 ```
-* YC mirror:
-```
-wget -qO - lwrap.website.yandexcloud.net|bash
-```
 * HF mirror:
 ```
 wget -qO - lux-wine-git.static.hf.space|sed 1d|bash

diff --git a/lux-wine b/lux-wine
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export LW_VERSION="0.78.5.3"
+export LW_VERSION="0.78.5.4"
 export LW_DEVELOPERS="VHSgunzo"
 
 export RED='\033[1;91m'
@@ -225,8 +225,8 @@ check_def_config() {
     export DEFPFX_HF_URL="https://huggingface.co/lux-wine/wine-prefix/resolve/main/releases/$DEFPFX_VERSION/defprefix.xz.lwpfx"
     export DEFPFXDOTNET_HF_URL="https://huggingface.co/lux-wine/wine-prefix/resolve/main/releases/$DEFPFX_VERSION/defprefix_dotnet.xz.lwpfx"
     export DEFPFXDOTNETDESKTOP_HF_URL="https://huggingface.co/lux-wine/wine-prefix/resolve/main/releases/$DEFPFX_VERSION/defprefix_dotnetdesktop.xz.lwpfx"
-    export DEFPFX_YC_URL="https://storage.yandexcloud.net/lux-wine/wine-prefix/$DEFPFX_VERSION/defprefix.xz.lwpfx"
-    export DEFPFXDOTNET_YC_URL="https://storage.yandexcloud.net/lux-wine/wine-prefix/$DEFPFX_VERSION/defprefix_dotnet.xz.lwpfx"
+    #export DEFPFX_YC_URL="https://storage.yandexcloud.net/lux-wine/wine-prefix/$DEFPFX_VERSION/defprefix.xz.lwpfx"
+    #export DEFPFXDOTNET_YC_URL="https://storage.yandexcloud.net/lux-wine/wine-prefix/$DEFPFX_VERSION/defprefix_dotnet.xz.lwpfx"
 }
 
 print_var() {
@@ -2530,8 +2530,8 @@ check_db_script() {
                                     elif [ -f "$LWRAP_DEFPFXDOTNET" ]
                                         then PFXRESTORE="$LWRAP_DEFPFXDOTNET"
                                     else
-                                        if (try_download "$DEFPFXDOTNET_YC_URL" "$LW_DEF_WINEPFXBKP_DIR/"||\
-                                            try_download "$DEFPFXDOTNET_HF_URL" "$LW_DEF_WINEPFXBKP_DIR/"||\
+                                        #if (try_download "$DEFPFXDOTNET_YC_URL" "$LW_DEF_WINEPFXBKP_DIR/"||\
+                                        if (try_download "$DEFPFXDOTNET_HF_URL" "$LW_DEF_WINEPFXBKP_DIR/"||\
                                             try_download "$DEFPFXDOTNET_URL" "$LW_DEF_WINEPFXBKP_DIR/")
                                             then PFXRESTORE="$LWDIR_DEFPFXDOTNET"
                                             else exit 1
@@ -2560,8 +2560,8 @@ check_db_script() {
                                     elif [ -f "$LWRAP_DEFPFX" ]
                                         then PFXRESTORE="$LWRAP_DEFPFX"
                                     else
-                                        if (try_download "$DEFPFX_YC_URL" "$LW_DEF_WINEPFXBKP_DIR/"||\
-                                            try_download "$DEFPFX_HF_URL" "$LW_DEF_WINEPFXBKP_DIR/"||\
+                                        #if (try_download "$DEFPFX_YC_URL" "$LW_DEF_WINEPFXBKP_DIR/"||\
+                                        if (try_download "$DEFPFX_HF_URL" "$LW_DEF_WINEPFXBKP_DIR/"||\
                                             try_download "$DEFPFX_URL" "$LW_DEF_WINEPFXBKP_DIR/")
                                             then PFXRESTORE="$LWDIR_DEFPFX"
                                             else exit 1

diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='lwrap'
 pkgver='0.78.5'
-pkgrel='3'
+pkgrel='4'
 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
@@ -9,10 +9,10 @@ GREEN='\033[1;92m'
 YELLOW='\033[1;33m'
 RESETCOLOR='\033[1;00m'
 
-YC_S3="https://storage.yandexcloud.net"
+# YC_S3="https://storage.yandexcloud.net"
 GIT_REPO='https://github.com/VHSgunzo'
 GIT_HF_REPO='https://huggingface.co/spaces/lux-wine'
-GIT_YC_REPO="$YC_S3/lux-wine"
+# GIT_YC_REPO="$YC_S3/lux-wine"
 LW_DIR="$HOME/.local/share/LuxWine"
 MENU_APPS_DIR="$HOME/.local/share/applications"
 LW_APPS_DIR="$MENU_APPS_DIR/LuxWineApps"
@@ -23,16 +23,16 @@ LWSRC="$LWBIN_DIR/lux-wine"
 GIT_RAW='https://raw.githubusercontent.com/VHSgunzo/lux-wine/main'
 GIT_LWSRC="$GIT_RAW/lux-wine"
 GIT_HF_LWSRC="$GIT_HF_REPO/git/resolve/main/lux-wine"
-GIT_YC_LWSRC="$GIT_YC_REPO/git/lux-wine"
+# GIT_YC_LWSRC="$GIT_YC_REPO/git/lux-wine"
 GIT_LWZIP="$GIT_REPO/lux-wine/archive/refs/heads/main.zip"
 GIT_HF_LWZIP="$GIT_HF_REPO/git/resolve/main/main.zip"
-GIT_YC_LWZIP="$GIT_YC_REPO/main.zip"
+# GIT_YC_LWZIP="$GIT_YC_REPO/main.zip"
 GIT_LWRAP="$GIT_RAW/lwrap/lwrap"
 GIT_HF_LWRAP="$GIT_HF_REPO/git/resolve/main/lwrap/lwrap"
-GIT_YC_LWRAP="$GIT_YC_REPO/git/lwrap/lwrap"
+# GIT_YC_LWRAP="$GIT_YC_REPO/git/lwrap/lwrap"
 GIT_LWRUN="$GIT_REPO/lwrun/releases"
 GIT_HF_LWRUN="${GIT_HF_REPO//\/spaces/}/lwrun/resolve/main/releases"
-YC_LWRUN="$YC_S3/lwrun"
+# YC_LWRUN="$YC_S3/lwrun"
 HOME_ICONS="$HOME/.local/share/icons"
 HOME_DESK_DIRS="$HOME/.local/share/desktop-directories"
 HSTEAM_DESKF="$MENU_APPS_DIR/steam-lw.desktop"
@@ -385,7 +385,7 @@ is_lwrun() { [ -x "$LWRUN" ] ; }
 
 try_dl_lwzip() {
     local lwzipurl=(
-        "$GIT_YC_LWZIP"
+#         "$GIT_YC_LWZIP"
         "$GIT_HF_LWZIP"
         "$GIT_LWZIP"
     )
@@ -438,7 +438,7 @@ vers_parser() { grep -Po '\d+'|sed ':a;/$/N;s/\n//;ta' ; }
 set_git_lw_version() {
     unset GIT_LW_VERSION
     local lwsrcusrls=(
-        "$GIT_YC_LWSRC"
+#         "$GIT_YC_LWSRC"
         "$GIT_HF_LWSRC"
         "$GIT_LWSRC"
     )
@@ -460,7 +460,7 @@ get_lw_version() {
 
 try_dllwrap_mirror() {
     local lwrapurl=(
-        "$GIT_YC_LWRAP"
+#         "$GIT_YC_LWRAP"
         "$GIT_HF_LWRAP"
         "$GIT_LWRAP"
     )
@@ -530,15 +530,16 @@ get_lwrun_hf_ver() {
         2>/dev/null|grep -Po "v\d+\.\d+\.\d+"|tail -1
 }
 
-get_lwrun_yc_ver() {
-    NO_ARIA2C=1 NO_DL_GUI=1 NO_DL_REPEAT=1 try_dl \
-        "$YC_LWRUN" /dev/stdout 2>/dev/null|tr '<' '\n'|\
-        grep '^Key>'|sed 's|^Key>||g'|grep '^releases'|\
-        awk -F/ 'END {print$2}'
-}
+# get_lwrun_yc_ver() {
+#     NO_ARIA2C=1 NO_DL_GUI=1 NO_DL_REPEAT=1 try_dl \
+#         "$YC_LWRUN" /dev/stdout 2>/dev/null|tr '<' '\n'|\
+#         grep '^Key>'|sed 's|^Key>||g'|grep '^releases'|\
+#         awk -F/ 'END {print$2}'
+# }
 
 set_git_lwrun_ver() {
-    for src in yc git hf
+#     for src in yc git hf
+    for src in git hf
         do
             GIT_LWRUN_VERSION="$(get_lwrun_${src}_ver)"
             [ -n "$GIT_LWRUN_VERSION" ] && return 0
@@ -548,7 +549,7 @@ set_git_lwrun_ver() {
 
 try_dllwrun_mirror() {
     local lwrunurl=(
-        "$YC_LWRUN/releases/$GIT_LWRUN_VERSION/lwrun"
+#         "$YC_LWRUN/releases/$GIT_LWRUN_VERSION/lwrun"
         "$GIT_HF_LWRUN/$GIT_LWRUN_VERSION/lwrun"
         "$GIT_LWRUN/download/$GIT_LWRUN_VERSION/lwrun"
     )