diff --git a/internal/scripts/cli/kcl b/internal/scripts/cli/kcl index 120639251..86b4daab4 100755 --- a/internal/scripts/cli/kcl +++ b/internal/scripts/cli/kcl @@ -4,17 +4,10 @@ set -e # kclvm_cli path -kclvm_cli_bin=`which kclvm_cli` -kclvm_install_dir=$(cd `dirname $0`/..; pwd) - -# check kclvm_cli -if [ -z "$kclvm_cli_bin" ]; then - echo "kclvm cli not found!" - exit 1 -fi - -export PYTHONPATH=$kclvm_install_dir/lib/site-packages -export KCLVM_CLI_BIN_PATH=$kclvm_install_dir/bin +install_dir=$(cd `dirname $0`/..; pwd) +export PYTHONPATH=$install_dir/lib/site-packages +export KCLVM_CLI_BIN_PATH=$install_dir/bin +kclvm_cli_bin=$install_dir/bin/kclvm_cli # Only for v0.4.x, all CLIs will be unified after v0.5.x case $1 in "version" | "--version" | "-v" | "-V") diff --git a/internal/scripts/cli/kcl-fmt b/internal/scripts/cli/kcl-fmt index effc210be..d3ba1fc5d 100755 --- a/internal/scripts/cli/kcl-fmt +++ b/internal/scripts/cli/kcl-fmt @@ -4,15 +4,8 @@ set -e # kclvm_cli path -kclvm_cli_bin=`which kclvm_cli` -kclvm_install_dir=$(cd `dirname $0`/..; pwd) - -# check kclvm_cli -if [ -z "$kclvm_cli_bin" ]; then - echo "kclvm cli not found!" - exit 1 -fi - -export PYTHONPATH=$kclvm_install_dir/lib/site-packages -export KCLVM_CLI_BIN_PATH=$kclvm_install_dir/bin +install_dir=$(cd `dirname $0`/..; pwd) +export PYTHONPATH=$install_dir/lib/site-packages +export KCLVM_CLI_BIN_PATH=$install_dir/bin +kclvm_cli_bin=$install_dir/bin/kclvm_cli $kclvm_cli_bin fmt "$@" diff --git a/internal/scripts/cli/kcl-lint b/internal/scripts/cli/kcl-lint index d143d0a76..467fd4a76 100755 --- a/internal/scripts/cli/kcl-lint +++ b/internal/scripts/cli/kcl-lint @@ -4,15 +4,8 @@ set -e # kclvm_cli path -kclvm_cli_bin=`which kclvm_cli` -kclvm_install_dir=$(cd `dirname $0`/..; pwd) - -# check kclvm_cli -if [ -z "$kclvm_cli_bin" ]; then - echo "kclvm cli not found!" - exit 1 -fi - -export PYTHONPATH=$kclvm_install_dir/lib/site-packages -export KCLVM_CLI_BIN_PATH=$kclvm_install_dir/bin +install_dir=$(cd `dirname $0`/..; pwd) +export PYTHONPATH=$install_dir/lib/site-packages +export KCLVM_CLI_BIN_PATH=$install_dir/bin +kclvm_cli_bin=$install_dir/bin/kclvm_cli $kclvm_cli_bin lint "$@" diff --git a/internal/scripts/cli/kcl-vet b/internal/scripts/cli/kcl-vet index 42dd36726..a74e0497f 100755 --- a/internal/scripts/cli/kcl-vet +++ b/internal/scripts/cli/kcl-vet @@ -4,15 +4,8 @@ set -e # kclvm_cli path -kclvm_cli_bin=`which kclvm_cli` -kclvm_install_dir=$(cd `dirname $0`/..; pwd) - -# check kclvm_cli -if [ -z "$kclvm_cli_bin" ]; then - echo "kclvm cli not found!" - exit 1 -fi - -export PYTHONPATH=$kclvm_install_dir/lib/site-packages -export KCLVM_CLI_BIN_PATH=$kclvm_install_dir/bin +install_dir=$(cd `dirname $0`/..; pwd) +export PYTHONPATH=$install_dir/lib/site-packages +export KCLVM_CLI_BIN_PATH=$install_dir/bin +kclvm_cli_bin=$install_dir/bin/kclvm_cli $kclvm_cli_bin vet "$@" diff --git a/internal/scripts/python-plugin/release.sh b/internal/scripts/python-plugin/release.sh index 9bcd5e200..f21fdb777 100755 --- a/internal/scripts/python-plugin/release.sh +++ b/internal/scripts/python-plugin/release.sh @@ -1,5 +1,14 @@ #!/usr/bin/env bash +topdir=$PWD +# Environment +if [ -f "/etc/os-release" ]; then + source /etc/os-release + os=$ID +else + os=$(uname) +fi + release_file="kclvm-$os-latest.tar.gz" release_path="$topdir/_build" package_dir="$topdir/_build/python_dist/$os"