Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents 583565a + 529627b commit 1f27eb70c4e33907845a4c97dbb6c72c35eaf172 Ken Moore committed Oct 24, 2013
Showing with 3 additions and 3 deletions.
  1. +3 −3 src-sh/pbi-manager10/pbi-manager
@@ -3969,7 +3969,7 @@ mk_xdg_desktop_script() {
# Copy over the .desktop file, modifying any variables within
cat "${i}" \
| sed "s|%%PBI_EXEDIR%%|$PBI_PROGDIRPATH/$PBI_FAKEBIN_DIR|g" \
- | sed "s|%%PBI_APPDIR%%|$PBI_PROGDIRPATH|g" \
+ | sed "s|%%PBI_APPDIR%%|${PBI_PROGDIRPATH}/local|g" \
> "${dir}/PBI-${i}"
# Set the correct permissions on the desktop file
@@ -4013,7 +4013,7 @@ mk_xdg_menu_script() {
# Copy the desktop file, changing any included vars
cat "${i}" \
| sed "s|%%PBI_EXEDIR%%|$PBI_PROGDIRPATH/$PBI_FAKEBIN_DIR|g" \
- | sed "s|%%PBI_APPDIR%%|$PBI_PROGDIRPATH|g" \
+ | sed "s|%%PBI_APPDIR%%|${PBI_PROGDIRPATH}/local|g" \
> "${dir}/PBI-${i}"
# Set the correct permissions on the menu file
@@ -4027,7 +4027,7 @@ mk_xdg_menu_script() {
if [ -e "${dirfile}.directory" ] ; then
cat "${dirfile}.directory" \
| sed "s|%%PBI_EXEDIR%%|$PBI_PROGDIRPATH/$PBI_FAKEBIN_DIR|g" \
- | sed "s|%%PBI_APPDIR%%|$PBI_PROGDIRPATH|g" \
+ | sed "s|%%PBI_APPDIR%%|${PBI_PROGDIRPATH}/local|g" \
> "${dir}/PBI-${dirfile}.directory"
#cp "${dirfile}.directory" "${dir}/PBI-${dirfile}.directory"
ifd="$PBI_PROGDIRPATH/${PBI_APPMENU_DIR}/PBI-${dirfile}.directory "

0 comments on commit 1f27eb7

Please sign in to comment.