Some little fixes.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1339 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -230,12 +230,12 @@ uqm_process_config() {
|
|||||||
|
|
||||||
uqm_load_config()
|
uqm_load_config()
|
||||||
{
|
{
|
||||||
menu_load MENU main "$BUILD_WORK/config.state"
|
do_menu_load MENU main "$BUILD_WORK/config.state"
|
||||||
}
|
}
|
||||||
|
|
||||||
uqm_save_config()
|
uqm_save_config()
|
||||||
{
|
{
|
||||||
menu_save MENU main "$BUILD_WORK/config.state"
|
do_menu_save MENU main "$BUILD_WORK/config.state"
|
||||||
}
|
}
|
||||||
|
|
||||||
uqm_pre_build() {
|
uqm_pre_build() {
|
||||||
|
|||||||
@@ -124,7 +124,9 @@ build_config() {
|
|||||||
config_requirements
|
config_requirements
|
||||||
eval "${TARGET}_requirements"
|
eval "${TARGET}_requirements"
|
||||||
eval "${TARGET}_prepare_config"
|
eval "${TARGET}_prepare_config"
|
||||||
|
eval "${TARGET}_load_config"
|
||||||
eval "${TARGET}_do_config"
|
eval "${TARGET}_do_config"
|
||||||
|
eval "${TARGET}_save_config"
|
||||||
}
|
}
|
||||||
|
|
||||||
build_reconfig() {
|
build_reconfig() {
|
||||||
@@ -133,6 +135,7 @@ build_reconfig() {
|
|||||||
fi
|
fi
|
||||||
config_requirements
|
config_requirements
|
||||||
eval "${TARGET}_requirements"
|
eval "${TARGET}_requirements"
|
||||||
|
eval "${TARGET}_load_config"
|
||||||
build_process_config
|
build_process_config
|
||||||
echo "Reconfiguring complete..." 1>&2
|
echo "Reconfiguring complete..." 1>&2
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -620,7 +620,7 @@ do_menu() {
|
|||||||
# $3 - the name of the file to load from
|
# $3 - the name of the file to load from
|
||||||
# Returns: 0 - if the file was loaded successfully
|
# Returns: 0 - if the file was loaded successfully
|
||||||
# 1 - if the file did not exist
|
# 1 - if the file did not exist
|
||||||
menu_load() {
|
do_menu_load() {
|
||||||
SAVE_FILE=$3
|
SAVE_FILE=$3
|
||||||
|
|
||||||
if [ ! -e "$SAVE_FILE" ]; then
|
if [ ! -e "$SAVE_FILE" ]; then
|
||||||
@@ -636,7 +636,7 @@ menu_load() {
|
|||||||
# $2 - the name of the menu
|
# $2 - the name of the menu
|
||||||
# $3 - the name of the file to save to
|
# $3 - the name of the file to save to
|
||||||
# Returns: 0 - if the file was saved successfully
|
# Returns: 0 - if the file was saved successfully
|
||||||
menu_save() {
|
do_menu_save() {
|
||||||
MENU_TYPE=$1
|
MENU_TYPE=$1
|
||||||
START_MENU=$2
|
START_MENU=$2
|
||||||
SAVE_FILE=$3
|
SAVE_FILE=$3
|
||||||
|
|||||||
Reference in New Issue
Block a user