kn-cli 1.0.83 → 1.0.84

package/build/dev.sh

@@ -1,3 +1,15 @@
 export build_type=dev
+
+
+if [ ! -n "$build_log_level" ]
+then
+  if [  $build_env != 'prod' ]
+  then
+    export build_log_level=all
+  else
+    export build_log_level=clear
+  fi
+fi
+
 # 如果 export dev_mode=watch 则启动webpack -w模式而非webpack-dev-server
 . ./start.sh

package/build/shellUtil.sh

@@ -5,31 +5,68 @@ checkResult(){
   ret=$?
   if [ $ret != 0 ]
   then
-    printf "[$1] \e[40;31m 执行失败 \e[0m\n"
+    printf "\e[40;31m [$1] 执行失败 \e[0m\n"
     exit 2
     return 0
   else
-    printf "[$1] \e[40;32m 执行成功\e[0m \n"
+    printf "\e[40;32m [$1] 执行成功\e[0m \n"
     return 0
   fi
 }
 
 
 
+checkKnCli(){
+  # 方案一：始终将kn-cli保持为最新版本
+  # npm i kn-cli -g
+  # return 0
+  
+  # 方案二：保持kn-cli为固定某个版本
+  # npm i kn-cli@1.0.26 -g
+  # return 0
+
+  # 方案三：检测未安装时或版本不为最新版本时更新
+  if ! [ -x "$(command -v kn-cli)" ]
+  then
+    echo "安装kn-cli"
+    npm i kn-cli -g
+    return 0
+  fi
+
+  for line in `npm view kn-cli version` 
+  do
+    for line2 in `kn-cli -v` 
+    do
+    if [ $line != $line2 ]
+    then
+      echo "升级kn-cli"
+      npm upgrade kn-cli -g
+      return 0
+    fi
+    done
+  done
+  return 0
+}
+
+
 showLog() {
   local text="$1"
   local color="$2"
   local color_code=""
   case "$color" in
+    "white") color_code="";;
     "red") color_code="\e[40;31m";;
     "green") color_code="\e[40;32m";;
     "blue") color_code="\e[40;34m";;
     "yellow") color_code="\e[40;33m";;
-    *) color_code="";; 
+    *) color_code="\e[40;30m";; 
   esac
   printf "%b\n" "${color_code}${text}\e[0m"
 }
 
+showNormal(){
+  showLog "$1" "white"
+}
 showSuccess() {
   showLog "$1" "green"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-cli",
-  "version": "1.0.83",
+  "version": "1.0.84",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/build.js

@@ -363,6 +363,9 @@ module.exports= async (options={})=> {
   try{
     await tasks.run();
   }catch(err){
+    if(err.message.indexOf('执行build异常')>=0){
+      return 0;
+    }
     console.log(chalk.red.bold(err.message));
     return 0;
   }

package/templates/template_admin/dev.sh

@@ -3,69 +3,9 @@ then
   . ${HOME}/.nvm/nvm.sh
 fi
 
-node_version="v16.18.0"
-
-checkNode(){
-  for line in `node -v` 
-  do
-  if [ $line != $node_version ]
-  then
-    echo "change Node from $line to $node_version"
-    nvm use $node_version
-    ret=$?
-    if [ $ret != 0 ]
-    then
-      echo "Please run nvm install $node_version"
-      exit 3
-    else
-      return 0
-    fi
-  else
-    return 0
-  fi
-  done
-}
-
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
-
-
-
-
-# 智能检测并安装/升级CLI的版本
-checkKnCli(){
-  # dev只需要保持安装了就行，版本通过开发自己控制
-  if ! [ -x "$(command -v kn-cli)" ]
-  then
-    echo "安装kn-cli"
-    npm i kn-cli -g
-    return 0
-  fi
-  # for line in `npm view kn-cli version` 
-  # do
-  #   for line2 in `kn-cli -v` 
-  #   do
-  #   if [ $line != $line2 ]
-  #   then
-  #     echo "升级kn-cli"
-  #     npm upgrade kn-cli -g
-  #     return 0
-  #   fi
-  #   done
-  # done
-  # return 0
-}
+. ./shellUtil.sh
 
+node_version="v16.18.0"
 
 
 build(){
@@ -82,7 +22,7 @@ build(){
   checkResult "kn-cli --dev"
 }
 
-checkNode
+checkNode "${node_version}"
 checkResult "检查node"
 
 build

package/templates/template_admin/frontend_build.sh

@@ -2,55 +2,13 @@ if [ -d "${HOME}/.nvm/" ]
 then
   . ${HOME}/.nvm/nvm.sh
 fi
+. ./shellUtil.sh
 
 export mock=0
 export noSkipNpmInstall=1
 node_version="v16.18.0"
 
-checkNode(){
-  for line in `node -v` 
-  do
-  if [ $line != $node_version ]
-  then
-    echo "change Node from $line to $node_version"
-    nvm use $node_version
-    ret=$?
-    if [ $ret != 0 ]
-    then
-      echo "Please run nvm install $node_version"
-      exit 3
-    else
-      return 0
-    fi
-  else
-    return 0
-  fi
-  done
-}
-
-
-checkKnCli(){
-  if ! [ -x "$(command -v kn-cli)" ]
-  then
-    npm i kn-cli -g
-    return 0
-  fi
-  return 0
-}
-
 
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
 
 build(){
   npm config delete registry -g
@@ -76,7 +34,7 @@ build(){
   checkResult "复制favicon"
 }
 
-checkNode
+checkNode "${node_version}"
 checkResult "检查node"
 
 

package/templates/template_admin/init.sh

@@ -1,15 +1,6 @@
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
+
+. ./shellUtil.sh
+
 
 echo "安装git提交钩子脚本 cp prepare-commit-msg ./.git/hooks/prepare-commit-msg"  
 ls -A ./.git/

package/templates/template_admin/report.sh

@@ -3,52 +3,9 @@ then
   . ${HOME}/.nvm/nvm.sh
 fi
 
-node_version="v16.18.0"
-
-checkNode(){
-  for line in `node -v` 
-  do
-  if [ $line != $node_version ]
-  then
-    echo "change Node from $line to $node_version"
-    nvm use $node_version
-    ret=$?
-    if [ $ret != 0 ]
-    then
-      echo "Please run nvm install $node_version"
-      exit 3
-    else
-      return 0
-    fi
-  else
-    return 0
-  fi
-  done
-}
-
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
-
-
-checkKnCli(){
-  if ! [ -x "$(command -v kn-cli)" ]
-  then
-    npm i kn-cli -g
-    return 0
-  fi
-  return 0
-}
+. ./shellUtil.sh
 
+node_version="v16.18.0"
 
 build(){
   npm config delete registry -g
@@ -61,7 +18,7 @@ build(){
   checkResult "kn-cli --report"
 }
 
-checkNode
+checkNode "${node_version}"
 checkResult "检查node"
 
 build

package/templates/template_admin/shellUtil.sh

@@ -0,0 +1,110 @@
+
+
+
+checkResult(){
+  ret=$?
+  if [ $ret != 0 ]
+  then
+    printf "\e[40;31m [$1] 执行失败 \e[0m\n"
+    exit 2
+    return 0
+  else
+    printf "\e[40;32m [$1] 执行成功\e[0m \n"
+    return 0
+  fi
+}
+
+
+
+checkKnCli(){
+  # 方案一：始终将kn-cli保持为最新版本
+  # npm i kn-cli -g
+  # return 0
+  
+  # 方案二：保持kn-cli为固定某个版本
+  # npm i kn-cli@1.0.26 -g
+  # return 0
+
+  # 方案三：检测未安装时或版本不为最新版本时更新
+  if ! [ -x "$(command -v kn-cli)" ]
+  then
+    echo "安装kn-cli"
+    npm i kn-cli -g
+    return 0
+  fi
+
+  for line in `npm view kn-cli version` 
+  do
+    for line2 in `kn-cli -v` 
+    do
+    if [ $line != $line2 ]
+    then
+      echo "升级kn-cli"
+      npm upgrade kn-cli -g
+      return 0
+    fi
+    done
+  done
+  return 0
+}
+
+
+showLog() {
+  local text="$1"
+  local color="$2"
+  local color_code=""
+  case "$color" in
+    "white") color_code="";;
+    "red") color_code="\e[40;31m";;
+    "green") color_code="\e[40;32m";;
+    "blue") color_code="\e[40;34m";;
+    "yellow") color_code="\e[40;33m";;
+    *) color_code="\e[40;30m";; 
+  esac
+  printf "%b\n" "${color_code}${text}\e[0m"
+}
+
+showNormal(){
+  showLog "$1" "white"
+}
+showSuccess() {
+  showLog "$1" "green"
+}
+
+showError() {
+  showLog "$1" "red"
+}
+showWarn() {
+  showLog "$1" "yellow"
+}
+
+showInput(){
+  local text="$1"
+  printf "%b" "\e[40;35m${text}\e[0m" >&2
+}
+
+
+
+
+checkNode(){
+  local node_version="$1"
+  
+  for line in `node -v` 
+  do
+  if [ $line != $node_version ]
+  then
+    showWarn "change Node from ${line} to ${node_version}"
+    nvm use $node_version
+    ret=$?
+    if [ $ret != 0 ]
+    then
+      showError "Please run nvm install ${node_version}"
+      exit 3
+    else
+      return 0
+    fi
+  else
+    return 0
+  fi
+  done
+}

package/templates/template_admin/versionPublish.sh

@@ -1,16 +1,5 @@
 
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
+. ./shellUtil.sh
 
 # version=$(grep -m1 '"version":' package.json | awk -F'"' '{print $4}')
 # checkResult "获取当前版本号"

package/templates/template_app/dev.sh

@@ -3,69 +3,9 @@ then
   . ${HOME}/.nvm/nvm.sh
 fi
 
-node_version="v16.18.0"
-
-checkNode(){
-  for line in `node -v` 
-  do
-  if [ $line != $node_version ]
-  then
-    echo "change Node from $line to $node_version"
-    nvm use $node_version
-    ret=$?
-    if [ $ret != 0 ]
-    then
-      echo "Please run nvm install $node_version"
-      exit 3
-    else
-      return 0
-    fi
-  else
-    return 0
-  fi
-  done
-}
-
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
-
-
-
-
-# 智能检测并安装/升级CLI的版本
-checkKnCli(){
-  # dev只需要保持安装了就行，版本通过开发自己控制
-  if ! [ -x "$(command -v kn-cli)" ]
-  then
-    echo "安装kn-cli"
-    npm i kn-cli -g
-    return 0
-  fi
-  # for line in `npm view kn-cli version` 
-  # do
-  #   for line2 in `kn-cli -v` 
-  #   do
-  #   if [ $line != $line2 ]
-  #   then
-  #     echo "升级kn-cli"
-  #     npm upgrade kn-cli -g
-  #     return 0
-  #   fi
-  #   done
-  # done
-  # return 0
-}
+. ./shellUtil.sh
 
+node_version="v16.18.0"
 
 
 build(){
@@ -82,7 +22,7 @@ build(){
   checkResult "kn-cli --dev"
 }
 
-checkNode
+checkNode "${node_version}"
 checkResult "检查node"
 
 build

package/templates/template_app/frontend_build.sh

@@ -3,80 +3,12 @@ then
   . ${HOME}/.nvm/nvm.sh
 fi
 
+. ./shellUtil.sh
+
 export mock=0
 export noSkipNpmInstall=1
 node_version="v16.18.0"
 
-checkNode(){
-  for line in `node -v` 
-  do
-  if [ $line != $node_version ]
-  then
-    echo "change Node from $line to $node_version"
-    nvm use $node_version
-    ret=$?
-    if [ $ret != 0 ]
-    then
-      echo "Please run nvm install $node_version"
-      exit 3
-    else
-      return 0
-    fi
-  else
-    return 0
-  fi
-  done
-}
-
-
-
-# 智能检测并安装/升级CLI的版本
-checkKnCli(){
-  # 方案一：始终将kn-cli保持为最新版本
-  # npm i kn-cli -g
-  # return 0
-  
-  # 方案二：保持kn-cli为固定某个版本
-  # npm i kn-cli@1.0.26 -g
-  # return 0
-
-  # 方案三：检测未安装时或版本不为最新版本时更新
-  if ! [ -x "$(command -v kn-cli)" ]
-  then
-    echo "安装kn-cli"
-    npm i kn-cli -g
-    return 0
-  fi
-
-  for line in `npm view kn-cli version` 
-  do
-    for line2 in `kn-cli -v` 
-    do
-    if [ $line != $line2 ]
-    then
-      echo "升级kn-cli"
-      npm upgrade kn-cli -g
-      return 0
-    fi
-    done
-  done
-  return 0
-}
-
-
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
-
 build(){
   npm config delete registry -g
   npm config delete registry
@@ -101,7 +33,7 @@ build(){
   checkResult "复制favicon"
 }
 
-checkNode
+checkNode "${node_version}"
 checkResult "检查node"
 
 

package/templates/template_app/report.sh

@@ -3,51 +3,9 @@ then
   . ${HOME}/.nvm/nvm.sh
 fi
 
-node_version="v16.18.0"
-
-checkNode(){
-  for line in `node -v` 
-  do
-  if [ $line != $node_version ]
-  then
-    echo "change Node from $line to $node_version"
-    nvm use $node_version
-    ret=$?
-    if [ $ret != 0 ]
-    then
-      echo "Please run nvm install $node_version"
-      exit 3
-    else
-      return 0
-    fi
-  else
-    return 0
-  fi
-  done
-}
-
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
-
+. ./shellUtil.sh
 
-checkKnCli(){
-  if ! [ -x "$(command -v kn-cli)" ]
-  then
-    npm i kn-cli -g
-    return 0
-  fi
-  return 0
-}
+node_version="v16.18.0"
 
 
 build(){
@@ -61,7 +19,7 @@ build(){
   checkResult "kn-cli --report"
 }
 
-checkNode
+checkNode "${node_version}"
 checkResult "检查node"
 
 build