all repos — fluxbox @ e30f235daf6993631a0a3ec32cce1e16ec791441

custom fork of the fluxbox windowmanager 

fix from NetBSD for using the home directory of the user who compiled fluxbox
also fix 'regenerate menu' code to use correct program name, rather than $0
markt markt
commit

e30f235daf6993631a0a3ec32cce1e16ec791441

parent

9ed25584a17269efe85e63fe560bf00c495258c1

1 files changed, 3 insertions(+), 3 deletions(-)

jump to
M util/fluxbox-generate_menu.in → util/fluxbox-generate_menu.in 
@@ -1210,7 +1210,7 @@ ;;
 esac
 
 # Set Defaults
-USERFLUXDIR="${HOME}/.@pkgprefix@fluxbox@pkgsuffix@"
+USERFLUXDIR="\${HOME}/.@pkgprefix@fluxbox@pkgsuffix@"
 MENUFILENAME="${MENUFILENAME:=${USERFLUXDIR}/menu}"
 MENUTITLE="${MENUTITLE:=Fluxbox}"
 HOMEPAGE="${HOMEPAGE:=fluxbox.org}"

@@ -1708,7 +1708,7 @@ 
        append_submenu "${XUTILSMENU}"
            normal_find xfontsel xman xload xbiff editres viewres xclock \
                xmag wmagnify gkrellm gkrellm2 vmware portagemaster agave 
-           find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load $HOME/.Xdefaults}"
+           find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load \$HOME/.Xdefaults}"
        append_menu_end
 append_menu_end
 

@@ -1879,7 +1879,7 @@ find_it import append "[exec] (${SCREENSHOT} - PNG) {import screenshot.png && display -resize 50% screenshot.png}"
         find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTIONS}"
         find_it switch append "[exec] (gtk-theme-switch) {switch}"
         find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}"
-        find_it $0 append "[exec] (${REGENERATEMENU}) {$0 ${BACKUPOPTIONS}}"
+        find_it $0 append "[exec] (${REGENERATEMENU}) {@pkgprefix@fluxbox-generate_menu@pkgsuffix@ ${BACKUPOPTIONS}}"
     append_menu_end
 
     append_submenu "${WINDOWMANAGERS}"