11#! /usr/bin/env bash
22
3- export LW_VERSION=" 0.77.9.7 "
3+ export LW_VERSION=" 0.77.9.8 "
44export LW_DEVELOPERS=" VHSgunzo"
55
66export RED=' \033[1;91m'
@@ -1443,7 +1443,7 @@ reg_edit() {
14431443}
14441444
14451445exe2png () {
1446- unset rm_ico
1446+ unset SHRT_ICON rm_ico
14471447 if [ -f " $exe_ico " ]
14481448 then
14491449 local SHRT_NAME=" $( basename " $exe_ico " | sed ' s|\.ico$||gi' ) "
@@ -1542,6 +1542,7 @@ exe2png() {
15421542 else
15431543 print_error notify " Failed to get ico from exe file!"
15441544 export SHRT_ICON=" $LW_DEF_ICO "
1545+ return 1
15451546 fi
15461547 fi
15471548 else
@@ -1554,7 +1555,7 @@ create_shortcut() {
15541555 if [ -n " $1 " ]
15551556 then
15561557 SHRT_NAME=" ${ADD_APP_NAME// [^[:alnum:] ._-]/ } "
1557- SHRT_NAME=" $( sed ' s|^Запустить ||gi;s|^Играть ||gi' <<< " $SHRT_NAME" ) "
1558+ SHRT_NAME=" $( sed ' s|^Запустить ||gi;s|^Играть ||gi;s|^Launch ||gi ' <<< " $SHRT_NAME" ) "
15581559 try_mkdir " $LW_DEF_TMP "
15591560 DESKF=" ${LW_DEF_TMP} /${SHRT_NAME} .desktop"
15601561 echo " [Desktop Entry]" > " $DESKF "
@@ -3637,7 +3638,7 @@ shrt_from_lnk() {
36373638 lnk_name_alnum=" ${lnk_name// [^[:alnum:] ._-]/ } "
36383639 SHRT_NAME=" $( echo " $lnk_name " | sed ' s|\.lnk$||i' ) "
36393640 lnk_exe_drive=" $( lnk_data_get ' Local Base Path' | drive_tolower) "
3640- lnk_exe=" $( lnk_data_get ' Local Base Path' | fix_path) "
3641+ lnk_exe=" $( ipath " $( lnk_data_get ' Local Base Path' | fix_path) " | head -1 ) "
36413642 lnk_exe_ico=" $( lnk_data_get ' Icon File Name' ) "
36423643 lnk_exe_ico_drive=" $( echo " $lnk_exe_ico " | fix_winstd_path| drive_tolower) "
36433644 lnk_exe_ico=" $( ipath " $( lnk_exe_drive=$lnk_exe_ico_drive ; echo " $lnk_exe_ico " | fix_path) " | head -1) "
@@ -3660,7 +3661,7 @@ shrt_from_lnk() {
36603661 ! " ${IGNLNK[@],,} " =~ " ${lnk_name,,} " && \
36613662 " $lnk_args " != " --uninstall" ]]
36623663 then
3663- LU_EXE=" $( ipath " $ lnk_exe" | head -1 ) "
3664+ LU_EXE=" $lnk_exe "
36643665 if [ -f " $LU_EXE " ]
36653666 then
36663667 if [[ -n " $lnk_args " && ! -n " $( grep -F " '$lnk_exe ' $lnk_args " -lr " $LW_APPS_DIR " 2> /dev/null|| \
@@ -3679,6 +3680,7 @@ shrt_from_lnk() {
36793680 get_shrt_data ;;
36803681 * .[Ee][Xx][Ee]) LU_EXE=" $lnk_exe_ico " get_shrt_data " $lnk_exe_ico " ;;
36813682 esac
3683+ [ " $? " == 0 ]|| get_shrt_data " $LU_EXE "
36823684 else get_shrt_data " $LU_EXE "
36833685 fi
36843686 create_shortcut " $lnk_exe " " $lnk_args "
@@ -3746,6 +3748,7 @@ shrt_from_url() {
37463748 get_shrt_data ;;
37473749 * .[Ee][Xx][Ee]) LU_EXE=" $url_exe_ico " get_shrt_data " $url_exe_ico " ;;
37483750 esac
3751+ [ " $? " == 0 ]|| get_shrt_data " $LU_EXE "
37493752 else get_shrt_data " $LU_EXE "
37503753 fi
37513754 create_shortcut " $LU_EXE " " $url_name "
0 commit comments