=== modified file 'bin/fsb' --- bin/fsb 2013-05-20 09:14:50 +0000 +++ bin/fsb 2013-05-18 10:21:46 +0000 @@ -126,32 +126,18 @@ } # build functions -typeset -g build_dir build_dir_base +typeset -g build_dir build_target_new() { - local -a info_vars - local -A info + local -a target_stack info_vars info_vars=( FSB_INFO_BASE # base build directory name passed up to calling stage - FSB_INFO_DIR # directory for building this stage - FSB_INFO_KEEP # whether to keep build directory around - FSB_INFO_SKIP # skip calling build stage of this script - FSB_INFO_DEPEND # build this stage first and then clone it's directory + FSB_INFO_DIR + FSB_INFO_KEEP + FSB_INFO_SKIP + FSB_INFO_DEPEND ) typeset -g $info_vars - $1 info || die "$1 info failed" - local param - for param in $info_vars; do - info[${param#FSB_INFO_}=${(P)param} - done - if [[ $FSB_INFO_BASE == *'%s'* ]]; then - else - if [[ $FSB_INFO_DIR == *'%s'* ]]; then - FSB_INFO_DIR=${FSB_INFO_DIR/%s/${FSB_INFO_BASE}} - build_dir_check $FSB_INFO_DIR $1 && return 0 - [[ $? -eq 100 ]] || die "build_dir_check failed" - fi - fi } typeset -ga build_dir_stack === modified file 'functions/fsb_target_gentoo_init' --- functions/fsb_target_gentoo_init 2013-05-20 09:14:50 +0000 +++ functions/fsb_target_gentoo_init 2013-05-18 10:21:46 +0000 @@ -8,11 +8,7 @@ FSB_INFO_BASE+=-p$STAGE_PORTAGE_TS FSB_INFO_BASE+=-o$STAGE_OVERLAY_REVNO FSB_INFO_DIR=%s-conf - -elif [[ $1 != build ]]; then - die "unimplemented action: $*" fi - local dir profile profile_link accept_keywords case $STAGE_GENTOO_BRANCH in