nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid trailing spaces between app and closing }

Browse source 
Add a few lines of code to prevent a few spaces in some menu output.
'{$app $options}' would expand to '{app }' if no options were set.

Also, while scattered throughout, in this particular spot the
unnecessary braces around some of the variables (and not around some
others) and inside flux's braces could be very visually confusing and
lead to editing errors, so removed those.
This commit is contained in:
slakmagik 2011-03-28 23:21:15 -04:00 committed by Mathias Gumz
parent 0fbb2cb73c
commit a8583b79ae
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
util/fluxbox-generate_menu.in
View file

@ -1314,6 +1314,11 @@ EOF
fi
BACKUPOPTIONS=$@
if [ -n "$BACKUPOPTIONS" ]; then
FBGM_CMD="@pkgprefix@fluxbox-generate_menu@pkgsuffix@ $BACKUPOPTIONS"
else
FBGM_CMD=@pkgprefix@fluxbox-generate_menu@pkgsuffix@
fi
# Get options.
while [ $# -gt 0 ]; do
case "$1" in
@ -1530,6 +1535,13 @@ DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME`
if [ -z "$LAUNCHER" ]; then
LAUNCHER=@pkgprefix@fbrun@pkgsuffix@
fi
if [ -n "$FBRUNOPTIONS" ]; then
# with this, LAUNCHER should be renamed LAUNCHER_NAME, but then there's
# backwards-compatibility...
LAUNCHER_CMD="$LAUNCHER $FBRUNOPTIONS"
else
LAUNCHER_CMD=$LAUNCHER
fi
# Start of menu
cat << EOF > ${MENUFILENAME}
@ -1570,7 +1582,7 @@ case "$DEFAULT_BROWSERNAME" in
*) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
esac
find_it "${LAUNCHER}" append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTIONS}"
find_it "${LAUNCHER}" append "[exec] (${RUNCOMMAND}) {$LAUNCHER_CMD}"
append_submenu "${TERMINALMENU}"
@ -1859,10 +1871,10 @@ append_submenu "${FBSETTINGSMENU}"
"[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|xmessage -file - -center}"
find_it import append "[exec] (${SCREENSHOT} - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg}"
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 ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {$LAUNCHER_CMD}"
find_it switch append "[exec] (gtk-theme-switch) {switch}"
find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}"
find_it @pkgprefix@fluxbox-generate_menu@pkgsuffix@ append "[exec] (${REGENERATEMENU}) {@pkgprefix@fluxbox-generate_menu@pkgsuffix@ ${BACKUPOPTIONS}}"
find_it @pkgprefix@fluxbox-generate_menu@pkgsuffix@ append "[exec] (${REGENERATEMENU}) {$FBGM_CMD}"
append_menu_end
append_submenu "${WINDOWMANAGERS}"