From owner-svn-ports-head@freebsd.org Mon May 16 07:51:56 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4094B3D35C; Mon, 16 May 2016 07:51:56 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 680821244; Mon, 16 May 2016 07:51:56 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4G7ptlV087626; Mon, 16 May 2016 07:51:55 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4G7ptJG087625; Mon, 16 May 2016 07:51:55 GMT (envelope-from se@FreeBSD.org) Message-Id: <201605160751.u4G7ptJG087625@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Mon, 16 May 2016 07:51:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415312 - head/emulators/playonbsd/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2016 07:51:56 -0000 Author: se Date: Mon May 16 07:51:55 2016 New Revision: 415312 URL: https://svnweb.freebsd.org/changeset/ports/415312 Log: Really fix the generation of shortcut files. Approved by: antoine (mentor, implicit) Modified: head/emulators/playonbsd/files/patch-lib_scripts.lib Modified: head/emulators/playonbsd/files/patch-lib_scripts.lib ============================================================================== --- head/emulators/playonbsd/files/patch-lib_scripts.lib Mon May 16 06:44:13 2016 (r415311) +++ head/emulators/playonbsd/files/patch-lib_scripts.lib Mon May 16 07:51:55 2016 (r415312) @@ -5,13 +5,13 @@ if [ ! "$(POL_Config_Read NO_MENU_ICON)" = "TRUE" ]; then # Do nothing on Mac OS - if [ -n "$Categories" -a "$POL_OS" = "Linux" ] || [ -n "$Categories" -a "$POL_OS" = "BSD" ]; then -+ if [ -n "$Categories" -a "$POL_OS" = "Linux" ] ++ if [ -n "$Categories" -a "$POL_OS" = "Linux" ]; then LOCALAPPS="$HOME/.local/share/applications" make_desktop_shortcut "$iconPath" "$ICON_FILENAME" "$LOCALAPPS" "$PLAYONLINUX/playonlinux --run \"$ICON_FILENAME\"" "$binary_name" "$Categories" "playonlinux-" fi + if [ -n "$Categories" -a "$POL_OS" = "FreeBSD" ]; then + LOCALAPPS="$HOME/.local/share/applications" -+ make_desktop_shortcut "$iconPath" "$ICON_FILENAME" "$LOCALAPPS" "$PLAYONLINUX/playonbsd --run \"$ICON_FILENAME\"" "$binary_name" "$Categories" "playonlinux-" ++ make_desktop_shortcut "$iconPath" "$ICON_FILENAME" "$LOCALAPPS" "$PLAYONLINUX/playonfreebsd --run \"$ICON_FILENAME\"" "$binary_name" "$Categories" "playonlinux-" + fi fi @@ -44,3 +44,12 @@ } POL_Shortcut_MakeDesktopShortcut() { +@@ -1039,7 +1049,7 @@ POL_Shortcut_MakeDesktopShortcut() + # http://stackoverflow.com/questions/8939580/bash-split-a-string-exactly-like-readline-would-split-it + eval set -- $(grep '^POL_Wine ' "$POL_USER_ROOT/shortcuts/$PACKAGE"|tail -n 1) + local binary="$2" +- make_desktop_shortcut "$iconPath" "$PACKAGE" "$DESKTOP" "$PLAYONLINUX/playonlinux --run \"$PACKAGE\"" "$binary" "" ++ make_desktop_shortcut "$iconPath" "$PACKAGE" "$DESKTOP" "$PLAYONLINUX/playonfreebsd --run \"$PACKAGE\"" "$binary" "" + ;; + + *)