Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: refactor kcl scripts and cli from local path instead of PATH #566

Merged
merged 1 commit into from
Jun 6, 2023
Merged

chore: refactor kcl scripts and cli from local path instead of PATH #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions internal/scripts/cli/kcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
15 changes: 4 additions & 11 deletions internal/scripts/cli/kcl-fmt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
15 changes: 4 additions & 11 deletions internal/scripts/cli/kcl-lint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
15 changes: 4 additions & 11 deletions internal/scripts/cli/kcl-vet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
9 changes: 9 additions & 0 deletions internal/scripts/python-plugin/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down