From 3bcd6f69e7ad6740b18b1cb1ac25f3d6763cd784 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 1 Aug 2013 16:14:18 +0200 Subject: add new option '-k' to build config.tgz for given type. Example: ./mltk server -k freiburg --- mltk | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/mltk b/mltk index 28578381..ee965f49 100755 --- a/mltk +++ b/mltk @@ -162,7 +162,7 @@ read_params() { if [[ $1 != "-"* ]]; then TARGET=$1 shift - elif [[ $1 != "-s" ]] && [[ $1 != "-n" ]]; then + elif [[ $1 != "-s" && $1 != "-n" && $1 != "-k" ]]; then perror "A target is required. None given." fi @@ -174,9 +174,16 @@ read_params() { # options to current target if [[ "$PARAM" == "-"* ]]; then case "$PARAM" in + -k) + [ "$MODE" != "SERVER" ] && perror "-k can only be used in server mode" + # NOTE: check for validity of config is done in 'inital_checks' of server/export_target + SERVER_CONFIG_TYPE="$1" + SERVER_CONFIG="1" + shift + continue + ;; -s) SERVER_SYNC="1" - #TODO mit Remote IP continue ;; -c) @@ -206,8 +213,6 @@ read_params() { SERVER_EXPORT="1" SERVER_EXPORT_TYPE="$1" shift - SERVER_EXPORT_CONFIG="$1" - shift continue ;; -n) @@ -242,7 +247,7 @@ read_params() { # exit if no command - [[ $SERVER_CLEAN == 0 && $SERVER_EXPORT == 0 && $REMOTE_CLEAN == 0 && $REMOTE_BUILD == 0 && $SERVER_SYNC == 0 && $REMOTE_EXPORT == 0 ]] && print_usage && exit 1 + [[ $SERVER_CLEAN == 0 && $SERVER_EXPORT == 0 && $REMOTE_CLEAN == 0 && $REMOTE_BUILD == 0 && $SERVER_SYNC == 0 && $REMOTE_EXPORT == 0 && $SERVER_CONFIG == 0 ]] && print_usage && exit 1 } run() { @@ -253,12 +258,13 @@ run() { [[ $REMOTE_BUILD == 1 ]] && generate_target $TARGET $REMOTE_LIST_BUILD [[ $REMOTE_EXPORT == 1 ]] && export_builds fi - if [[ $SERVER_CLEAN == 1 || $SERVER_EXPORT == 1 || $SERVER_SYNC == 1 ]]; then + if [[ $SERVER_CLEAN == 1 || $SERVER_EXPORT == 1 || $SERVER_SYNC == 1 || $SERVER_CONFIG == 1 ]]; then [[ $SERVER_DEBUG == 1 ]] && unset_quiet || set_quiet . "${SERVER_EXPORT_TARGET}" || perror "Cannot source ${SERVER_EXPORT_TARGET}" [[ $SERVER_SYNC == 1 ]] && sync_remote [[ $SERVER_CLEAN == 1 ]] && clean_target $TARGET [[ $SERVER_EXPORT == 1 ]] && export_target $TARGET $SERVER_EXPORT_TYPE + [[ $SERVER_CONFIG == 1 ]] && echo "LASFKHSL" && generate_config $SERVER_CONFIG_TYPE fi } @@ -267,6 +273,7 @@ SERVER_EXPORT="0" SERVER_CLEAN="0" SERVER_EXPORT_TYPE="" SERVER_SYNC="0" +SERVER_CONFIG="0" REMOTE_DEBUG="0" REMOTE_CLEAN="0" REMOTE_BUILD="0" -- cgit v1.2.3-55-g7522