CastroFidel/winehelper
1
0
Fork 4
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check_installed_programs: updated run list

Browse Source
This commit is contained in:
Mikhail Tergoev
2025-07-08 10:49:52 +03:00
parent 10707bd010
commit 7c41d656aa
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
auto_completion/bash_completion/winehelper
View File

@ -22,7 +22,7 @@ _winehelper_completions() {
return 0
;;
run|installed)
local installed=$(grep -h "Exec=env" ~/.local/share/winehelper/*.desktop 2>/dev/null | awk -F'/' '{print $NF}' | awk -F'"' '{print $1}')
local installed=$(ls -1 ~/.local/share/winehelper/ | grep ".desktop" | sed 's/.desktop//')
COMPREPLY=( $(compgen -W "${installed}" -- "${cur}") )
return 0
;;

4
auto_completion/zsh_completion/_winehelper
View File

@ -101,9 +101,7 @@ _get_list_for_install () {
_get_installed_list () {
installed=(
${(f)"$(grep -h 'Exec=env' ~/.local/share/winehelper/*.desktop 2>/dev/null |
awk -F'/' '{print $NF}' |
awk -F'"' '{print $1}')"}
${(f)"$(ls -1 ~/.local/share/winehelper/ | grep ".desktop" | sed 's/.desktop//')"}
)
if ((! ${#installed[@]} == 0 )); then

7
winehelper
View File

@ -592,7 +592,7 @@ check_installed_programs () {
print_info "Список установленных программ:"
check_installed_programs
exit 1
elif [[ "$EXE_PATH" =~ ${2}$ ]] ; then
elif [[ "$desktop_file" =~ ${2}.desktop ]] ; then
export EXE_PATH
return 0
fi
@ -600,7 +600,8 @@ check_installed_programs () {
*)
if [[ -f "$EXE_PATH.whdb" ]] ; then
WH_INFO_RU="$(grep "info_ru:" "$EXE_PATH.whdb" | awk -F"info_ru: " '{print $2}')"
printf "\E[36m%s $SCRIPT_NAME run $(basename "$EXE_PATH") - $(basename "$desktop_file") %s\e[0m\n"
WH_PROG_NAME="$(grep "PROG_NAME" "$EXE_PATH.whdb" | awk -F"=" '{print $2}')"
printf "\E[36m%s $SCRIPT_NAME run $(basename "$desktop_file" .desktop) %s\e[0m- $WH_PROG_NAME\n"
echo -e "$WH_INFO_RU\n"
fi
;;
@ -1626,7 +1627,7 @@ wh_info () {
install [скрипт] --clear-pfx не использовать готовый префикс для установки ПО
installed список установленных программ
run [программа.exe] запуск программы (отладка)
run [программа] запуск программы (отладка)
remove-all удалить WineHelper и все связанные данные
remove-prefix [имя_префикса] удалить префикс и все связанные данные
backup-prefix [имя_префикса] создать резерную копию префикса