From cf52163efc7ce635d093dd9bae6a42dd467201d6 Mon Sep 17 00:00:00 2001 From: Peefy Date: Tue, 11 Apr 2023 10:46:34 +0800 Subject: [PATCH] chore: bump unix scripts and remove python3 in scripts. --- install.go | 14 -------------- scripts/kcl | 22 ++++++---------------- scripts/kcl-doc | 7 +++---- scripts/kcl-fmt | 23 ++++++----------------- scripts/kcl-lint | 24 ++++++------------------ scripts/kcl-plugin | 7 +++---- scripts/kcl-test | 2 +- scripts/kcl-vet | 23 ++++++----------------- scripts/kclvm | 20 -------------------- 9 files changed, 31 insertions(+), 111 deletions(-) diff --git a/install.go b/install.go index 7860aeab..df4f0756 100644 --- a/install.go +++ b/install.go @@ -1,8 +1,6 @@ package kclvm_artifact import ( - "bytes" - "fmt" "os" "os/exec" "path/filepath" @@ -118,18 +116,6 @@ func InstallKclvmPy(installRoot string) error { return err } - // Run KCL CLI to install dependencies. - cmd := exec.Command("kcl") - var errBuf bytes.Buffer - cmd.Stderr = &errBuf - err = cmd.Run() - if errBuf.Len() != 0 { - return fmt.Errorf("%s", errBuf.String()) - } - if err != nil { - return err - } - err = os.WriteFile(kclvmVersionPath, []byte(KCLVM_VERSION), os.FileMode(os.O_WRONLY|os.O_TRUNC)) if err != nil { return err diff --git a/scripts/kcl b/scripts/kcl index f5aa0b02..e6467f75 100755 --- a/scripts/kcl +++ b/scripts/kcl @@ -3,26 +3,16 @@ # Stop on error. set -e -# python3 path -python3_bin=`which python3` +# kclvm_cli path +kclvm_cli_bin=`which kclvm_cli` kclvm_install_dir=$(cd `dirname $0`/..; pwd) -# check python3 -if [ -z "$python3_bin" ]; then - echo "python3 not found!" +# check kclvm_cli +if [ -z "$kclvm_cli_bin" ]; then + echo "kclvm cli not found!" exit 1 fi -is_kclvm_installed=$($python3_bin -c "import pkgutil; print(bool(pkgutil.find_loader('kclvm')))") -# once: pip install -if [ "$is_kclvm_installed"x = "False"x ]; then - mkdir -pv $kclvm_install_dir/lib/site-packages/ - # check python3 version - $python3_bin -c "import sys; sys.exit(0) if sys.version_info>=(3,7,3) else (print('please install python 3.7.3+') or sys.exit(1))" - # kclvm pip install all libs - $python3_bin -m pip install kclvm --user -U -fi - export PYTHONPATH=$kclvm_install_dir/lib/site-packages export KCLVM_CLI_BIN_PATH=$kclvm_install_dir/bin -$python3_bin -m kclvm "$@" +$kclvm_cli_bin run "$@" diff --git a/scripts/kcl-doc b/scripts/kcl-doc index 89b99f95..1f71e77c 100755 --- a/scripts/kcl-doc +++ b/scripts/kcl-doc @@ -14,14 +14,13 @@ if [ -z "$python3_bin" ]; then exit 1 fi -is_kclvm_installed=$($python3_bin -c "import pkgutil; print(bool(pkgutil.find_loader('kclvm')))") # once: pip install -if [ "$is_kclvm_installed"x = "False"x ]; then - mkdir -pv $kclvm_install_dir/lib/site-packages/ +if [ ! -f $pip_install_done_file ]; then # check python3 version $python3_bin -c "import sys; sys.exit(0) if sys.version_info>=(3,7,3) else (print('please install python 3.7.3+') or sys.exit(1))" # kclvm pip install all libs - $python3_bin -m pip install kclvm --user -U + $python3_bin -m pip install -U kclvm --user + echo 'done' > $pip_install_done_file fi export PYTHONPATH=$kclvm_install_dir/lib/site-packages diff --git a/scripts/kcl-fmt b/scripts/kcl-fmt index 1e8ca7c3..effc210b 100755 --- a/scripts/kcl-fmt +++ b/scripts/kcl-fmt @@ -3,27 +3,16 @@ # Stop on error. set -e -# python3 path -python3_bin=`which python3` +# kclvm_cli path +kclvm_cli_bin=`which kclvm_cli` kclvm_install_dir=$(cd `dirname $0`/..; pwd) -pip_install_done_file="$kclvm_install_dir/lib/site-packages/kclvm.requirements.done.txt" -# check python3 -if [ -z "$python3_bin" ]; then - echo "python3 not found!" +# check kclvm_cli +if [ -z "$kclvm_cli_bin" ]; then + echo "kclvm cli not found!" exit 1 fi -is_kclvm_installed=$($python3_bin -c "import pkgutil; print(bool(pkgutil.find_loader('kclvm')))") -# once: pip install -if [ "$is_kclvm_installed"x = "False"x ]; then - mkdir -pv $kclvm_install_dir/lib/site-packages/ - # check python3 version - $python3_bin -c "import sys; sys.exit(0) if sys.version_info>=(3,7,3) else (print('please install python 3.7.3+') or sys.exit(1))" - # kclvm pip install all libs - $python3_bin -m pip install kclvm --user -U -fi - export PYTHONPATH=$kclvm_install_dir/lib/site-packages export KCLVM_CLI_BIN_PATH=$kclvm_install_dir/bin -$python3_bin -m kclvm.tools.format "$@" +$kclvm_cli_bin fmt "$@" diff --git a/scripts/kcl-lint b/scripts/kcl-lint index 3cc9cf12..d143d0a7 100755 --- a/scripts/kcl-lint +++ b/scripts/kcl-lint @@ -3,28 +3,16 @@ # Stop on error. set -e -# python3 path -python3_bin=`which python3` +# kclvm_cli path +kclvm_cli_bin=`which kclvm_cli` kclvm_install_dir=$(cd `dirname $0`/..; pwd) -pip_install_done_file="$kclvm_install_dir/lib/site-packages/kclvm.requirements.done.txt" -# check python3 -if [ -z "$python3_bin" ]; then - echo "python3 not found!" +# check kclvm_cli +if [ -z "$kclvm_cli_bin" ]; then + echo "kclvm cli not found!" exit 1 fi -is_kclvm_installed=$($python3_bin -c "import pkgutil; print(bool(pkgutil.find_loader('kclvm')))") -# once: pip install -if [ "$is_kclvm_installed"x = "False"x ]; then - mkdir -pv $kclvm_install_dir/lib/site-packages/ - # check python3 version - $python3_bin -c "import sys; sys.exit(0) if sys.version_info>=(3,7,3) else (print('please install python 3.7.3+') or sys.exit(1))" - # kclvm pip install all libs - $python3_bin -m pip install kclvm --user -U -fi - export PYTHONPATH=$kclvm_install_dir/lib/site-packages export KCLVM_CLI_BIN_PATH=$kclvm_install_dir/bin -$python3_bin -m kclvm.tools.lint "$@" - +$kclvm_cli_bin lint "$@" diff --git a/scripts/kcl-plugin b/scripts/kcl-plugin index ff6691d3..990927ac 100755 --- a/scripts/kcl-plugin +++ b/scripts/kcl-plugin @@ -14,14 +14,13 @@ if [ -z "$python3_bin" ]; then exit 1 fi -is_kclvm_installed=$($python3_bin -c "import pkgutil; print(bool(pkgutil.find_loader('kclvm')))") # once: pip install -if [ "$is_kclvm_installed"x = "False"x ]; then - mkdir -pv $kclvm_install_dir/lib/site-packages/ +if [ ! -f $pip_install_done_file ]; then # check python3 version $python3_bin -c "import sys; sys.exit(0) if sys.version_info>=(3,7,3) else (print('please install python 3.7.3+') or sys.exit(1))" # kclvm pip install all libs - $python3_bin -m pip install kclvm --user -U + $python3_bin -m pip install -U kclvm --user + echo 'done' > $pip_install_done_file fi export PYTHONPATH=$kclvm_install_dir/lib/site-packages diff --git a/scripts/kcl-test b/scripts/kcl-test index 775a9184..0c8914a1 100755 --- a/scripts/kcl-test +++ b/scripts/kcl-test @@ -2,7 +2,7 @@ kcl_go_path=$(cd `dirname $0`; pwd)/kcl-go if [[ ! -f $kcl_go_path ]]; then - echo "kcl-go not found, please check the installation" + echo "kcl-go not found, please check the installation at https://github.com/KusionStack/kclvm-go" exit 1 fi export PYTHONPATH='' diff --git a/scripts/kcl-vet b/scripts/kcl-vet index 0351d464..42dd3672 100755 --- a/scripts/kcl-vet +++ b/scripts/kcl-vet @@ -3,27 +3,16 @@ # Stop on error. set -e -# python3 path -python3_bin=`which python3` +# kclvm_cli path +kclvm_cli_bin=`which kclvm_cli` kclvm_install_dir=$(cd `dirname $0`/..; pwd) -pip_install_done_file="$kclvm_install_dir/lib/site-packages/kclvm.requirements.done.txt" -# check python3 -if [ -z "$python3_bin" ]; then - echo "python3 not found!" +# check kclvm_cli +if [ -z "$kclvm_cli_bin" ]; then + echo "kclvm cli not found!" exit 1 fi -is_kclvm_installed=$($python3_bin -c "import pkgutil; print(bool(pkgutil.find_loader('kclvm')))") -# once: pip install -if [ "$is_kclvm_installed"x = "False"x ]; then - mkdir -pv $kclvm_install_dir/lib/site-packages/ - # check python3 version - $python3_bin -c "import sys; sys.exit(0) if sys.version_info>=(3,7,3) else (print('please install python 3.7.3+') or sys.exit(1))" - # kclvm pip install all libs - $python3_bin -m pip install kclvm --user -U -fi - export PYTHONPATH=$kclvm_install_dir/lib/site-packages export KCLVM_CLI_BIN_PATH=$kclvm_install_dir/bin -$python3_bin -m kclvm.tools.validation "$@" +$kclvm_cli_bin vet "$@" diff --git a/scripts/kclvm b/scripts/kclvm index de4e8f9b..453a6bdb 100755 --- a/scripts/kclvm +++ b/scripts/kclvm @@ -3,27 +3,7 @@ # Stop on error. set -e -# python3 path -python3_bin=`which python3` kclvm_install_dir=$(cd `dirname $0`/..; pwd) -pip_install_done_file="$kclvm_install_dir/lib/site-packages/kclvm.requirements.done.txt" - -# check python3 -if [ -z "$python3_bin" ]; then - echo "python3 not found!" - exit 1 -fi - -is_kclvm_installed=$($python3_bin -c "import pkgutil; print(bool(pkgutil.find_loader('kclvm')))") -# once: pip install -if [ "$is_kclvm_installed"x = "False"x ]; then - mkdir -pv $kclvm_install_dir/lib/site-packages/ - # check python3 version - $python3_bin -c "import sys; sys.exit(0) if sys.version_info>=(3,7,3) else (print('please install python 3.7.3+') or sys.exit(1))" - # kclvm pip install all libs - $python3_bin -m pip install kclvm --user -U -fi - export KCLVM_CLI_BIN_PATH=$kclvm_install_dir/bin export PYTHONPATH=$kclvm_install_dir/lib/site-packages python3 "$@"