Skip to content

Commit a94ae11

Browse files
committed
fix install bug
1 parent 08954eb commit a94ae11

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

.github/workflows/onestep.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export RELEASE_DATE=$(TZ=UTC-8 date +'%y%m%d%H%M%S')
2828

2929
source ./configs/libs/${CONFIG_NAME}.sh
3030
export RELEASE_VERSION=$GIT_REPO_VERSION
31-
export TAG=${LIB_NAME}-${RELEASE_VERSION}-${RELEASE_DATE}
31+
export TAG=${CONFIG_NAME}-${RELEASE_VERSION}-${RELEASE_DATE}
3232

3333
export TITLE="👏👏${CONFIG_NAME}-${PLAT}-${RELEASE_VERSION}"
3434

do-install/main.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
2323
cd "$THIS_DIR"
2424

2525
function parse_lib_config() {
26+
local lib_config="$1"
27+
local config_file_name=$(basename "$lib_config")
28+
local config_name=${config_file_name%.sh}
2629

2730
local t=$(echo "PRE_COMPILE_TAG_$MR_PLAT" | tr '[:lower:]' '[:upper:]')
2831
local vt=$(eval echo "\$$t")
@@ -36,12 +39,14 @@ function parse_lib_config() {
3639
# yuv-stable-eb6e7bb-250225223408
3740
export TAG=$vt
3841

39-
local prefix="${LIB_NAME}-"
42+
local prefix="${config_name}-"
4043
local suffix=$(echo $TAG | awk -F - '{printf "-%s", $NF}')
4144
# 去掉前缀
4245
local temp=${TAG#$prefix}
4346
# 去掉后缀
4447
export VER=${temp%$suffix}
48+
# 跟onestep.sh保持一致,库名字是配置文件名
49+
export LIB_NAME="$config_name"
4550
}
4651

4752
function do_install_a_lib()
@@ -52,7 +57,7 @@ function do_install_a_lib()
5257

5358
echo "===[install $lib_config]===================="
5459
source "$lib_config"
55-
parse_lib_config
60+
parse_lib_config "$lib_config"
5661
if [[ $FORCE_XCFRAMEWORK ]];then
5762
./install-pre-xcf.sh
5863
else

0 commit comments

Comments
 (0)