已合并
del: upgrade script of asc-devkit #4251
qinhan创建于 7月10日
del: upgrade script of asc-devkit #4251
已合并
从已删除 :9.1.0合入到cann/asc-devkit9.1.0
共 1 个文件变更+1-6
| @@ -16,7 +16,6 @@ is_quiet=n | |||
| 16 | in_install_for_all=n | 16 | in_install_for_all=n |
| 17 | setenv_flag=n | 17 | setenv_flag=n |
| 18 | docker_root="" | 18 | docker_root="" |
| 19 | -sourcedir="$PWD/asc-devkit" | ||
| 20 | curpath=$(dirname $(readlink -f "$0")) | 19 | curpath=$(dirname $(readlink -f "$0")) |
| 21 | common_func_path="${curpath}/common_func.inc" | 20 | common_func_path="${curpath}/common_func.inc" |
| 22 | pkg_version_path="${curpath}/../version.info" | 21 | pkg_version_path="${curpath}/../version.info" |
| @@ -133,10 +132,6 @@ if [ ! -d "$common_parse_dir" ]; then | |||
| 133 | fi | 132 | fi |
| 134 | 133 | ||
| 135 | new_upgrade() { | 134 | new_upgrade() { |
| 136 | - if [ ! -d "${sourcedir}" ]; then | ||
| 137 | - log "INFO" "no need to upgrade asc-devkit files." | ||
| 138 | - return 0 | ||
| 139 | - fi | ||
| 140 | output_progress 10 | 135 | output_progress 10 |
| 141 | 136 | ||
| 142 | local setenv_option="" | 137 | local setenv_option="" |
| @@ -148,7 +143,7 @@ new_upgrade() { | |||
| 148 | fi | 143 | fi |
| 149 | # 执行安装 | 144 | # 执行安装 |
| 150 | custom_options="--custom-options=--common-parse-dir=$common_parse_dir,--logfile=$logfile,--stage=upgrade,--quiet=$is_quiet,--hetero-arch=$hetero_arch" | 145 | custom_options="--custom-options=--common-parse-dir=$common_parse_dir,--logfile=$logfile,--stage=upgrade,--quiet=$is_quiet,--hetero-arch=$hetero_arch" |
| 151 | - sh "$curpath/install_common_parser.sh" --package="asc-devkit" --install --username="$username" --usergroup="$usergroup" --set-cann-uninstall --upgrade \ | 146 | + sh "$curpath/install_common_parser.sh" --copy_all --package="asc-devkit" --install --username="$username" --usergroup="$usergroup" --set-cann-uninstall --upgrade \ |
| 152 | --version=$pkg_version --version-dir=$pkg_version_dir --use-share-info \ | 147 | --version=$pkg_version --version-dir=$pkg_version_dir --use-share-info \ |
| 153 | $setenv_option $in_install_for_all --docker-root="$docker_root" --chip="$chip_type" --feature="$feature_type" \ | 148 | $setenv_option $in_install_for_all --docker-root="$docker_root" --chip="$chip_type" --feature="$feature_type" \ |
| 154 | $custom_options "$common_parse_type" "$input_install_dir" "$curpath/filelist.csv" | 149 | $custom_options "$common_parse_type" "$input_install_dir" "$curpath/filelist.csv" |