Merge branch 'testing'

This commit is contained in:
Joerg Bornschein 2013-09-22 14:42:45 +02:00
commit 4fc8f46a14
2 changed files with 45 additions and 23 deletions

View File

@ -145,6 +145,21 @@ menuconfig:
@echo "Next, you can: " @echo "Next, you can: "
@echo " * 'make' to compile your borgware" @echo " * 'make' to compile your borgware"
test:
@echo $(CONFIG_SHELL)
@echo
@echo "========== Testing borg-16 ========== "
$(MAKE) -C scripts/lxdialog all
$(CONFIG_SHELL) scripts/Menuconfig config.in profiles/borg-16
$(MAKE)
$(MAKE) clean
@echo
@echo "========== Testing borg-ls ========== "
$(MAKE) -C scripts/lxdialog all
$(CONFIG_SHELL) scripts/Menuconfig config.in profiles/borg-ls
$(MAKE)
$(MAKE) clean
#%/menuconfig: #%/menuconfig:
# $(SH) "$(@D)/configure" # $(SH) "$(@D)/configure"
# @$(MAKE) what-now-msg # @$(MAKE) what-now-msg

View File

@ -1722,32 +1722,39 @@ echo -n ", parsing"
parse_config_files $CONFIG_IN parse_config_files $CONFIG_IN
echo "done." echo "done."
#
# Start the ball rolling from the top.
#
activate_menu MCmenu0
# if [ -z $2 ]; then # Interactive mode
# All done! #
# # Start the ball rolling from the top.
cleanup1 #
activate_menu MCmenu0
# #
# Confirm and Save # All done!
# #
if $DIALOG --backtitle "$backtitle" \ cleanup1
#
# Confirm and Save
#
if $DIALOG --backtitle "$backtitle" \
--yesno "Do you wish to save your new Borg configuration?" 5 60 --yesno "Do you wish to save your new Borg configuration?" 5 60
then then
save_configuration save_configuration
echo echo
echo echo
echo "*** End of Borg configuration." echo "*** End of Borg configuration."
echo echo
else else
echo echo
echo echo
echo Your Borg configuration changes were NOT saved. echo Your Borg configuration changes were NOT saved.
echo echo
fi
else # Second argument give; noninteractive!
echo "Loading configuration file $2"
load_config_file $2
save_configuration
fi fi
# Remove log if empty. # Remove log if empty.