do not create menuconfig during install, some style cleanups - Han

This commit is contained in:
fluxgen 2003-04-14 09:23:40 +00:00
parent 2623f307c0
commit b234bdae64

View file

@ -22,7 +22,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
# $Id: fluxbox-generate_menu,v 1.28 2003/04/09 08:59:03 fluxgen Exp $
# $Id: fluxbox-generate_menu,v 1.29 2003/04/14 09:23:40 fluxgen Exp $
#
# Portability notes:
@ -91,9 +91,9 @@ fluxbox-generate_menu was brought to you by:
Henrik Kinnunen: Project leader.
Han Boetes: Packaging, debugging and scripts.
Simon Bowden: Cleanups and compatibility for sun.
Jeramy B. Smith: Packaging assistance, gnome and kde menu system.
Filippo Pappalardo: Italian locales and -t option.
Simon Bowden: Cleanups and compatibility for sun.
$WHOAMI: Innocent bystander.
EOF
@ -480,16 +480,19 @@ case ${LC_ALL} in
esac
# Set Defaults
FILENAME="${HOME}/.fluxbox/menu"
MENUTITLE="Fluxbox"
HOMEPAGE="fluxbox.org"
USERMENU="${HOME}/.fluxbox/usermenu"
FILENAME="${FILENAME:=${HOME}/.fluxbox/menu}"
MENUTITLE="${MENUTITLE:=Fluxbox}"
HOMEPAGE="${HOMEPAGE:=fluxbox.org}"
USERMENU="${USERMENU:=${HOME}/.fluxbox/usermenu}"
# Read the menuconfig file if it exists or else create it.
# But not during install time, use envvar for sun
if [ ! ${INSTALL}="Yes" ];then
if [ -r ${HOME}/.fluxbox/menuconfig ]; then
. ${HOME}/.fluxbox/menuconfig
else
if [ ! "$WHOAMI" = root ]; then # this is only for users.
if touch ${HOME}/.fluxbox/menuconfig; then
cat<<EOF> ${HOME}/.fluxbox/menuconfig
# This file is read by fluxbox-generate_menu. If you don't like a
# default you can change it here. Don't forget to remove the # in front
@ -539,9 +542,12 @@ else
# REMOVE=no
EOF
else
echo "Warning: I could't create ${HOME}/.fluxbox/menuconfig" >&2
fi
fi
fi
fi
# Get options.
while getopts ":Bkhragb:t:p:w:u:n:q:o:m:" COMMAND_LINE_ARGUMENT ; do
case "${COMMAND_LINE_ARGUMENT}" in
@ -643,10 +649,10 @@ fi
# Start of menu
cat << EOF > ${FILENAME}
# Generated by fluxbox-genereate_menu
# Generated by fluxbox-generate_menu
#
# If you read this it means you want to edit this file manualy, so here
# are some usefull tips:
# If you read this it means you want to edit this file manually, so here
# are some useful tips:
#
# - You can add your own menu-entries to ~/.fluxbox/usermenu
#