diff --git a/winehelper b/winehelper index 8a970c7..b21733d 100755 --- a/winehelper +++ b/winehelper @@ -433,10 +433,10 @@ var_ld_library_path_update () { } create_desktop () { - local name_desktop exe_file desktop_filename icon_file + local name_desktop exe_file desktop_filename icon_file desktop_path name_desktop="$1" exe_file="$2" - if [[ -n $4 ]] ; + if [[ -n $4 ]] && [[ $4 != "nocopy" ]]; then desktop_filename="$4" else desktop_filename="$(basename "$exe_file" .exe | sed "s| |_|")" fi @@ -496,7 +496,6 @@ create_desktop () { echo "$name_desktop=${exe_file//$WINEPREFIX/}=$(basename "$icon_file")" >> "$WINEPREFIX/desktop.list" fi - # создаем файл категории для меню create_new_dir "$HOME/.local/share/desktop-directories" if [[ ! -f "$WH_MENU_CATEGORY" ]] ; then @@ -531,14 +530,8 @@ EOF update-desktop-database "$HOME/.local/share/applications" if [[ $4 != "nocopy" ]] ; then - if [[ -n $4 ]] ; then - local desktop_path="$(xdg-user-dir DESKTOP)/$4" - create_new_dir "$desktop_path" - print_info "В меню создан $desktop_filename.desktop и скопирован на рабочий стол в каталог $4" - else - local desktop_path="$(xdg-user-dir DESKTOP)" - print_info "В меню и на рабочем столе создан $desktop_filename.desktop" - fi + desktop_path="$(xdg-user-dir DESKTOP)" + print_info "В меню и на рабочем столе создан $desktop_filename.desktop" cp -f "$USER_WORK_PATH/$desktop_filename.desktop" "$desktop_path" else print_info "В меню создан $desktop_filename.desktop"