2ece7077a7
fix incorrect variable expansion fix menu backup
59 lines
2.1 KiB
Plaintext
59 lines
2.1 KiB
Plaintext
$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.3 2005/01/23 20:58:29 david Exp $
|
|
--- util/fluxbox-generate_menu.in.orig Wed Jan 5 09:25:44 2005
|
|
+++ util/fluxbox-generate_menu.in Sun Jan 23 14:49:52 2005
|
|
@@ -85,7 +85,7 @@ Options:
|
|
|
|
Only for packagers:
|
|
|
|
- -p prefix; default is /usr/local
|
|
+ -p prefix; default is @PREFIX@
|
|
-n Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected
|
|
-q KDE-prefix; idem dito
|
|
|
|
@@ -801,7 +801,7 @@ if [ ! "${INSTALL}" = Yes ]; then
|
|
# Your favourite terminal. Put the command in quotes if you want to use
|
|
# options. Put a backslash in before odd chars
|
|
# MY_TERM='Eterm --tint \#123456'
|
|
-# MY_TERM='aterm -tint $(random_color)'
|
|
+# MY_TERM='aterm -tint \$(random_color)'
|
|
|
|
# Your favourite browser. You can also specify options.
|
|
# MY_BROWSER=mozilla
|
|
@@ -837,7 +837,7 @@ if [ ! "${INSTALL}" = Yes ]; then
|
|
|
|
|
|
# Sepparate the list of background-dirs with semicolumns ':'
|
|
-# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:/usr/local/share/fluxbox/backgrounds/:/usr/share/wallpapers"
|
|
+# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers"
|
|
|
|
|
|
# --- Boolean variables.
|
|
@@ -949,8 +949,8 @@ if [ -w "${MENUFILENAME}" ]; then
|
|
if [ -f ${MENUFILENAME}.firstbak ]; then
|
|
cp ${MENUFILENAME} ${MENUFILENAME}.firstbak
|
|
fi
|
|
- if [ -s "${MENUFILE}" ]; then
|
|
- mv ${MENUFILE} ${MENUFILE}.bak
|
|
+ if [ -s "${MENUFILENAME}" ]; then
|
|
+ mv ${MENUFILENAME} ${MENUFILENAME}.bak
|
|
fi
|
|
fi
|
|
|
|
@@ -1241,7 +1241,6 @@ append_submenu "${FBSETTINGSMENU}"
|
|
|
|
append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
|
|
append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
|
|
- append "[stylesdir] (/usr/share/commonbox/styles/)"
|
|
append_menu_end
|
|
|
|
append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
|
|
@@ -1286,7 +1285,7 @@ append_submenu "${FBSETTINGSMENU}"
|
|
fi
|
|
fi
|
|
|
|
- append "[workspaces] (${WORKSPACEMENU})"
|
|
+ append "[workspaces] (${WORKSPACEMENU})"
|
|
|
|
append_submenu ${TOOLS}
|
|
normal_find fluxconf fluxkeys fluxmenu
|