From 02fa9d8e30e99114d140e7b8d950405545863546 Mon Sep 17 00:00:00 2001 From: MiaoWoo Date: Fri, 21 Jun 2019 13:12:59 +0800 Subject: [PATCH] feat: update cli.sh Signed-off-by: MiaoWoo --- cli.sh | 57 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/cli.sh b/cli.sh index 906d13c..80fc9bd 100755 --- a/cli.sh +++ b/cli.sh @@ -1,10 +1,36 @@ #!/bin/bash +SHELL_PREFIX="[FAAS-CLI]" +# Shell Base Script set -e +c_red="\033[38;5;1m" +c_blue="\033[38;5;4m" +c_green="\033[38;5;2m" +c_reset="\033[0m" +c_yellow="\033[38;5;3m" + +c_prefix="${c_blue}${SHELL_PREFIX}>>${c_reset}" + +dateStr() { + echo -e "[$(date '+%H:%M:%S')]" +} + +info() { + echo -e "${c_prefix}$(dateStr) ${*}" +} + +warn() { + echo -e "${c_prefix}$(dateStr) ${c_yellow}${*}${c_reset}" +} + +error() { + echo -e "${c_prefix}$(dateStr) ${c_red}${*}${c_reset}" +} +#==================== +cd $(dirname $0) + # User Input Variable -action=up -name= -type=micro +action= while [[ $# -gt 0 ]]; do case "$1" in @@ -12,14 +38,6 @@ while [[ $# -gt 0 ]]; do action="$2" shift ;; - -n|-p) - name="$2" - shift - ;; - -t) - type="$2" - shift - ;; -*) echo "Illegal option $1" ;; @@ -28,12 +46,17 @@ while [[ $# -gt 0 ]]; do done case "${action}" in - up) - faas-cli build -f ${name}.yml - faas-cli deploy -f ${name}.yml --label "com.openfaas.scale.zero=true" - ;; - create) - faas-cli new ${name} --lang cc-server + undo) + hash=$(git log -n 1 --format=format:%H) + tag=$(git tag -l --contains=${hash}) + if [[ -z "${tag}" ]]; then + error "last commit not have tag exit..." + exit 0 + fi + git reset HEAD^ + git tag -d ${tag} + git push origin master -f + git push origin :${tag} ;; esac