VHSgunzo commited on
Commit
64ac466
·
1 Parent(s): 68bc157

v0.78.2.4

Browse files
Files changed (5) hide show
  1. CHANGELOG.md +5 -2
  2. lutris-wine +1 -1
  3. lux-wine +20 -21
  4. lwrap/PKGBUILD +1 -1
  5. main.zip +2 -2
CHANGELOG.md CHANGED
@@ -1,8 +1,11 @@
1
  # v0.78.2.4
2
 
3
- * Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages
4
- * Update [GE-Proton](https://github.com/VHSgunzo/ge-proton-lw/releases/tag/v8.27) `v8.27`
5
  * Fix loading bar cover
 
 
 
6
 
7
  # v0.78.2.3
8
 
 
1
  # v0.78.2.4
2
 
3
+ * Update [steam-runtime-libs](https://github.com/VHSgunzo/steam-runtime-libs/releases/tag/v0.0.4) `v0.0.4`
4
+ * Update [GE-Proton](https://github.com/VHSgunzo/ge-proton-lw/releases/tag/v8.28) `v8.28`
5
  * Fix loading bar cover
6
+ * Add duplicate application installation config for automatically created shortcuts
7
+ * Fix creation of shortcuts
8
+ * Minor fixes
9
 
10
  # v0.78.2.3
11
 
lutris-wine CHANGED
@@ -1 +1 @@
1
- LW_VERSION="0.78.2.3"
 
1
+ LW_VERSION="0.78.2.4"
lux-wine CHANGED
@@ -1,6 +1,6 @@
1
  #!/usr/bin/env bash
2
 
3
- export LW_VERSION="0.78.2.3"
4
  export LW_DEVELOPERS="VHSgunzo"
5
 
6
  export RED='\033[1;91m'
@@ -30,8 +30,7 @@ ipath() {
30
  then local -n _res="$2" ; shift 2
31
  else local _res
32
  fi
33
- local arg="$(echo "$1"|\
34
- sed "s|[^[:alnum:]/$&+,:;=?@#|'<>.^%!-]|*|g")"
35
  local _path _i _chr
36
  _res=
37
  for ((_i=0;_i<"${#arg}";_i++))
@@ -1668,6 +1667,14 @@ create_shortcut() {
1668
  try_ln "$LW_APPS_DIR" "${LW_DIR}/"
1669
  try_mv "$DESKF" "${LW_APPS_DIR}/"
1670
  update-desktop-database -q "$MENU_APPS_DIR"
 
 
 
 
 
 
 
 
1671
  [ -f "${LW_APPS_DIR}/${SHRT_NAME}.desktop" ] && \
1672
  print_info notify "Shortcut for '$SHRT_NAME' successfully created!"
1673
  wait
@@ -2173,16 +2180,14 @@ check_shrt() (
2173
  )
2174
 
2175
  shrt_loop() {
2176
- WPFXDESKDIRS=(
2177
  "$WINEPREFIX/drive_c/users/steamuser/Desktop"
2178
  "$WINEPREFIX/drive_c/users/Public/Desktop"
2179
- )
2180
- WPFXMENUDIRS=(
2181
  "$WINEPREFIX/drive_c/users/steamuser/AppData/Roaming/Microsoft/Windows/Start Menu"
2182
  "$WINEPREFIX/drive_c/ProgramData/Microsoft/Windows/Start Menu"
2183
  )
2184
- find_wpfxlnk() { find "$@" -type f -iname "*.lnk" 2>/dev/null ; }
2185
- find_wpfxurl() { find "$@" -type f -iname "*.url" 2>/dev/null ; }
2186
  export pfxshrtname="$(basename "$WINEPREFIX")"
2187
  [ -f "/tmp/.lwshrt.$pfxshrtname" ] && \
2188
  ! pidof wineserver &>/dev/null && \
@@ -2204,16 +2209,10 @@ shrt_loop() {
2204
  while pidof wineserver &>/dev/null
2205
  do
2206
  sleep 1 2>/dev/null
2207
- WPREFIXLNK=($(find_wpfxlnk "${WPFXDESKDIRS[@]}"))
2208
  unset LU_EXE EXE_ARG
2209
  shrt_from_lnk "${WPREFIXLNK[@]}"
2210
- WPREFIXURL=($(find_wpfxurl "${WPFXDESKDIRS[@]}"))
2211
- unset LU_EXE EXE_ARG
2212
- shrt_from_url "${WPREFIXURL[@]}"
2213
- WPREFIXLNK=($(find_wpfxlnk "${WPFXMENUDIRS[@]}"))
2214
- unset LU_EXE EXE_ARG
2215
- shrt_from_lnk "${WPREFIXLNK[@]}"
2216
- WPREFIXURL=($(find_wpfxurl "${WPFXMENUDIRS[@]}"))
2217
  unset LU_EXE EXE_ARG
2218
  shrt_from_url "${WPREFIXURL[@]}"
2219
  check_tray
@@ -3877,14 +3876,14 @@ lu_shortcut() {
3877
  print_error yad "Shortcuts Creator" "Lux Wine Shortcuts Creator already runing!"
3878
  exit 1
3879
  fi
3880
- if [ -f "$LU_EXE" ]
 
 
 
 
3881
  then
3882
  get_shrt_data "$LU_EXE"
3883
  create_shortcut "$LU_EXE"
3884
- elif [ -n "$(basename "$LU_START"|grep -io "\.lnk$")" ]
3885
- then shrt_from_lnk "$(realpath "$LU_START")"
3886
- elif [ -n "$(basename "$LU_START"|grep -io "\.url$")" ]
3887
- then shrt_from_url "$(realpath "$LU_START")"
3888
  else
3889
  SHRT_EXE="$(yad --window-icon="$LW_DEF_ICO" --title "Lux Wine Shortcuts Creator" --file --center \
3890
  --file-filter="*.[Ee][Xx][Ee] *.[Ll][Nn][Kk]" --on-top --width=900 --height=600 --button="EXIT:1" --button="OK:0" 2>/dev/null)"
 
1
  #!/usr/bin/env bash
2
 
3
+ export LW_VERSION="0.78.2.4"
4
  export LW_DEVELOPERS="VHSgunzo"
5
 
6
  export RED='\033[1;91m'
 
30
  then local -n _res="$2" ; shift 2
31
  else local _res
32
  fi
33
+ local arg="$(sed "s|[^[:alnum:]/$&+,:;=?@#|'<>.^%!-]|*|g"<<<"$1")"
 
34
  local _path _i _chr
35
  _res=
36
  for ((_i=0;_i<"${#arg}";_i++))
 
1667
  try_ln "$LW_APPS_DIR" "${LW_DIR}/"
1668
  try_mv "$DESKF" "${LW_APPS_DIR}/"
1669
  update-desktop-database -q "$MENU_APPS_DIR"
1670
+ if [ -f "$LU_EXE" ] && [[ -f "$EXE_CFG" || -f "$EXE_CENV" ]]
1671
+ then
1672
+ local SHRTEXEPFX="$(dirname "$LU_EXE")/$(basename "$LU_EXE"|sed 's|\.exe$||gi')"
1673
+ [ -f "$EXE_CFG" ] && \
1674
+ try_cp "$EXE_CFG" "$SHRTEXEPFX.wcfg"
1675
+ [ -f "$EXE_CENV" ] && \
1676
+ try_cp "$EXE_CENV" "$SHRTEXEPFX.cenv"
1677
+ fi
1678
  [ -f "${LW_APPS_DIR}/${SHRT_NAME}.desktop" ] && \
1679
  print_info notify "Shortcut for '$SHRT_NAME' successfully created!"
1680
  wait
 
2180
  )
2181
 
2182
  shrt_loop() {
2183
+ WPFXSHRTDIRS=(
2184
  "$WINEPREFIX/drive_c/users/steamuser/Desktop"
2185
  "$WINEPREFIX/drive_c/users/Public/Desktop"
 
 
2186
  "$WINEPREFIX/drive_c/users/steamuser/AppData/Roaming/Microsoft/Windows/Start Menu"
2187
  "$WINEPREFIX/drive_c/ProgramData/Microsoft/Windows/Start Menu"
2188
  )
2189
+ find_wpfxlnk() { find "$@" -type f -iname "*.lnk" 2>/dev/null|sort -u ; }
2190
+ find_wpfxurl() { find "$@" -type f -iname "*.url" 2>/dev/null|sort -u ; }
2191
  export pfxshrtname="$(basename "$WINEPREFIX")"
2192
  [ -f "/tmp/.lwshrt.$pfxshrtname" ] && \
2193
  ! pidof wineserver &>/dev/null && \
 
2209
  while pidof wineserver &>/dev/null
2210
  do
2211
  sleep 1 2>/dev/null
2212
+ WPREFIXLNK=($(find_wpfxlnk "${WPFXSHRTDIRS[@]}"))
2213
  unset LU_EXE EXE_ARG
2214
  shrt_from_lnk "${WPREFIXLNK[@]}"
2215
+ WPREFIXURL=($(find_wpfxurl "${WPFXSHRTDIRS[@]}"))
 
 
 
 
 
 
2216
  unset LU_EXE EXE_ARG
2217
  shrt_from_url "${WPREFIXURL[@]}"
2218
  check_tray
 
3876
  print_error yad "Shortcuts Creator" "Lux Wine Shortcuts Creator already runing!"
3877
  exit 1
3878
  fi
3879
+ if [ -n "$(grep -io "\.lnk$"<<<"$LU_EXE")" ]
3880
+ then shrt_from_lnk "$(realpath "$LU_START")"
3881
+ elif [ -n "$(grep -io "\.url$"<<<"$LU_EXE")" ]
3882
+ then shrt_from_url "$(realpath "$LU_START")"
3883
+ elif [ -f "$LU_EXE" ]
3884
  then
3885
  get_shrt_data "$LU_EXE"
3886
  create_shortcut "$LU_EXE"
 
 
 
 
3887
  else
3888
  SHRT_EXE="$(yad --window-icon="$LW_DEF_ICO" --title "Lux Wine Shortcuts Creator" --file --center \
3889
  --file-filter="*.[Ee][Xx][Ee] *.[Ll][Nn][Kk]" --on-top --width=900 --height=600 --button="EXIT:1" --button="OK:0" 2>/dev/null)"
lwrap/PKGBUILD CHANGED
@@ -2,7 +2,7 @@
2
 
3
  pkgname='lwrap'
4
  pkgver='0.78.2'
5
- pkgrel='3'
6
  pkgdesc='Lux Wine wrapper for RunImage container'
7
  arch=('x86_64')
8
  url='https://github.com/VHSgunzo/lux-wine'
 
2
 
3
  pkgname='lwrap'
4
  pkgver='0.78.2'
5
+ pkgrel='4'
6
  pkgdesc='Lux Wine wrapper for RunImage container'
7
  arch=('x86_64')
8
  url='https://github.com/VHSgunzo/lux-wine'
main.zip CHANGED
@@ -1,3 +1,3 @@
1
  version https://git-lfs.github.com/spec/v1
2
- oid sha256:01bf99e525d6093cf7e8f49628761c4ab2d941462847fe20a384a4c92ad16833
3
- size 580589
 
1
  version https://git-lfs.github.com/spec/v1
2
+ oid sha256:0e17b381a4b8316d04f1bf0d5fd5d8d91231f6b8c8930d20333632fb1ac9bdf8
3
+ size 580686