|
1 | 1 | #!/usr/bin/env bash |
2 | 2 |
|
3 | | -export LW_VERSION="0.78.5.5" |
| 3 | +export LW_VERSION="0.80.1" |
4 | 4 | export LW_DEVELOPERS="VHSgunzo" |
5 | 5 |
|
6 | 6 | export RED='\033[1;91m' |
@@ -59,7 +59,7 @@ OLD_LW_DIR="$HOME/.local/share/LutrisWine" |
59 | 59 | [ ! -n "$LW_NAME" ] && export LW_NAME="$(basename "$0")" |
60 | 60 | [ ! -n "$LW_DIR" ] && export LW_DIR="$HOME/.local/share/LuxWine" |
61 | 61 | [ ! -n "$LW_BIN_DIR" ] && export LW_BIN_DIR="$LW_DIR/bin" |
62 | | -[ ! -n "$LWRAP" ] && export LWRAP="$LW_BIN_DIR/lwrap" |
| 62 | +[ ! -n "$LWRUN" ] && export LWRUN="$LW_BIN_DIR/lwrun" |
63 | 63 | if [ ! -n "$LW_TRAY" ] |
64 | 64 | then |
65 | 65 | [ "$DESKTOP_SESSION" == "plasma" ] && \ |
@@ -1561,7 +1561,7 @@ create_shortcut() { |
1561 | 1561 | SHRT_NAME="$SHRT_NAME ($(basename "$WINEPREFIX"))" |
1562 | 1562 | DESKF="${LW_DEF_TMP}/${SHRT_NAME}.desktop" |
1563 | 1563 | echo "[Desktop Entry]" > "$DESKF" |
1564 | | - (LW_SOURCE="$LWRAP" |
| 1564 | + (LW_SOURCE="$LWRUN" |
1565 | 1565 | [[ "$1" =~ "'" ]] && \ |
1566 | 1566 | SHRTEXEPATH="\"$1\""||\ |
1567 | 1567 | SHRTEXEPATH="'$1'" |
@@ -3770,11 +3770,11 @@ is_app_exist() { |
3770 | 3770 | do |
3771 | 3771 | [ -n "$(if [ -n "$args" ] |
3772 | 3772 | then |
3773 | | - awk -v s="Exec='$LWRAP' '$1' $args" '$0==s' "$app" 2>/dev/null |
3774 | | - awk -v s="Exec='$LWRAP' \"$1\" $args" '$0==s' "$app" 2>/dev/null |
| 3773 | + awk -v s="Exec='$LWRUN' '$1' $args" '$0==s' "$app" 2>/dev/null |
| 3774 | + awk -v s="Exec='$LWRUN' \"$1\" $args" '$0==s' "$app" 2>/dev/null |
3775 | 3775 | else |
3776 | | - awk -v s="Exec='$LWRAP' '$1'" '$0==s' "$app" 2>/dev/null |
3777 | | - awk -v s="Exec='$LWRAP' \"$1\"" '$0==s' "$app" 2>/dev/null |
| 3776 | + awk -v s="Exec='$LWRUN' '$1'" '$0==s' "$app" 2>/dev/null |
| 3777 | + awk -v s="Exec='$LWRUN' \"$1\"" '$0==s' "$app" 2>/dev/null |
3778 | 3778 | fi|head -1)" ] && ret=0 && echo "$app" && break |
3779 | 3779 | done |
3780 | 3780 | return $ret |
@@ -4160,13 +4160,11 @@ lu_help() { |
4160 | 4160 | exit 1 |
4161 | 4161 | fi |
4162 | 4162 | echo_help() { |
4163 | | - [[ "$RUNSRC" =~ "lwrun" ]] && \ |
4164 | | - local LW_NAME="lwrap" |
4165 | 4163 | echo -e " |
4166 | 4164 | ${GREEN}Lux Wine ${RED}v${LW_VERSION} ${GREEN}by $LW_DEVELOPERS |
4167 | 4165 | ${RED}Usage: |
4168 | 4166 | $RED┌──[$GREEN$USER$YELLOW@$BLUE`uname -a|awk '{print$2}'`$RED]─[$GREEN$PWD$RED] |
4169 | | - $RED└──╼ \$$GREEN $LW_NAME $BLUE{$LW_NAME arg} ${RED}blabla.exe $YELLOW{exe args} |
| 4167 | + $RED└──╼ \$$GREEN lwrun $BLUE{lwrun arg} ${RED}blabla.exe $YELLOW{exe args} |
4170 | 4168 |
|
4171 | 4169 | ${RED}-explorer $GREEN Wine explorer |
4172 | 4170 | ${RED}-cmd $GREEN Open CMD or open file in CMD |
@@ -6915,44 +6913,6 @@ if [[ "$EUID" == 0 && "$ALLOW_ROOT" != 1 ]] |
6915 | 6913 | print_error yad "Don't run Lux Wine as root!" |
6916 | 6914 | exit 1 |
6917 | 6915 | else |
6918 | | - (if [[ "$RUNSRC" =~ "lwrun" ]] |
6919 | | - then |
6920 | | - lwait_fl="/tmp/.lwait.$RUNPID" |
6921 | | - [[ -f "$lwait_fl" && ! -d "/proc/$RUNPID" ]] && \ |
6922 | | - rm -f "$lwait_fl" |
6923 | | - if [ ! -f "$lwait_fl" ] |
6924 | | - then |
6925 | | - find_processes() { |
6926 | | - processes="$(ls -l /proc/*/exe 2>/dev/null|grep ' ->')" |
6927 | | - for ps in "${IGNPS[@]}" |
6928 | | - do processes="$(grep -wv "$ps"<<<"$processes")" |
6929 | | - done |
6930 | | - } |
6931 | | - IGNPS=( |
6932 | | - 'tee' 'ls' 'ssrv' 'cat' 'tini' |
6933 | | - 'sleep' 'gamemoded' 'bash' 'grep' |
6934 | | - ) |
6935 | | - find_processes |
6936 | | - wait_lwpids=100 |
6937 | | - while [[ "$wait_lwpids" -gt 0 && \ |
6938 | | - ! -n "$processes" && -d "/proc/$LWPID" ]] |
6939 | | - do |
6940 | | - wait_lwpids="$(( $wait_lwpids - 1 ))" |
6941 | | - sleep 0.01 2>/dev/null |
6942 | | - find_processes |
6943 | | - done |
6944 | | - touch "$lwait_fl" |
6945 | | - while [[ -f "$lwait_fl" && \ |
6946 | | - -n "$processes" && -d "/proc/$LWPID" ]] |
6947 | | - do |
6948 | | - sleep 1 |
6949 | | - find_processes |
6950 | | - done |
6951 | | - rm -f "$lwait_fl" |
6952 | | - sleep 0.5 |
6953 | | - fi |
6954 | | - fi) 2>/dev/null & |
6955 | | - lwait_pid=$! |
6956 | 6916 | lite_init "$@" |
6957 | 6917 | case $1 in |
6958 | 6918 | -init) full_init "$@" ;; |
@@ -6992,4 +6952,3 @@ if [[ "$EUID" == 0 && "$ALLOW_ROOT" != 1 ]] |
6992 | 6952 | *) lu_start "$@" ;; |
6993 | 6953 | esac |
6994 | 6954 | fi |
6995 | | -wait "$lwait_pid" &>/dev/null |
0 commit comments