From 4b7206966c429eb9a2e31dfed3412ceef15c4daa Mon Sep 17 00:00:00 2001 From: hw082182638/hw082182638 <944451855@qq.com> Date: Sun, 28 Apr 2024 10:57:39 +0800 Subject: [PATCH] fix devkit install bash --- scripts/devkit/common.sh | 2 +- scripts/devkit/deploy_devkit.sh | 2 +- scripts/devkit/install_devkit.sh | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/devkit/common.sh b/scripts/devkit/common.sh index 2c3c8ef..ae19834 100755 --- a/scripts/devkit/common.sh +++ b/scripts/devkit/common.sh @@ -343,7 +343,7 @@ function get_user_choice(){ echo "Do you want to authorize the tool to handle the items failed in the installation environment check? You input is:$y_n" >> "${INSTALL_LOG}" echo "Installation Start Phase:Clearable=True" >> ${INSTALL_LOG} local input=$(input_value_check ${input}) - if [[ "${input}" == "yes" ]]; then + if [[ "${input}" == "yes" ]] || [[ -z "${input}" ]]; then user_choice=yes return 0 elif [[ "${input}" == "no" ]]; then diff --git a/scripts/devkit/deploy_devkit.sh b/scripts/devkit/deploy_devkit.sh index 12c95f0..abbf278 100644 --- a/scripts/devkit/deploy_devkit.sh +++ b/scripts/devkit/deploy_devkit.sh @@ -4,7 +4,7 @@ set timeout 1500 set devkit_dir_path [lindex $argv 0] cd $devkit_dir_path -spawn $devkit_dir_path/install_devkit.sh +spawn $devkit_dir_path/install_devkit.sh --plugin=porting,affinity,devtools,debugger,sys_perf expect { "The preceding dependencies will be automatically installed with DevKit. If source installation packages are available, add the installation paths to the LD_LIBRARY_PATH or PATH environment variable. Do you allow automatic installation of these dependencies?" { send "y\r\n"; exp_continue } diff --git a/scripts/devkit/install_devkit.sh b/scripts/devkit/install_devkit.sh index 1927333..4df494e 100755 --- a/scripts/devkit/install_devkit.sh +++ b/scripts/devkit/install_devkit.sh @@ -679,7 +679,6 @@ function entry_parameter_mode() { --plugin=*) is_empty "${install_tool}" "Install tool" install_tool=$(echo "$1" | awk -F= '{if($2 !="") print $2}') - check_plugin_legitimate ;; -a | --all) is_empty "${install_tool}" "Install tool" -- Gitee