-lib-config option support relative path

Author: debugly

do-compile/apple/main.sh

@@ -25,6 +25,7 @@ cd "$THIS_DIR"
 function do_compile_a_lib() 
 {
     local lib_config="$1"
+    lib_config=$(make_absolute_path "$lib_config")
     [[ ! -f "$lib_config" ]] && (echo "❌$lib_config config not exist, compile will stop."; exit 1;)
 
     echo "===[$MR_CMD $lib]===================="
@@ -49,7 +50,7 @@ function compile_libs()
     # 循环编译所有的库
     for lib in $MR_VENDOR_LIBS
     do
-        do_compile_a_lib "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh"
+        do_compile_a_lib "configs/libs/${lib}.sh"
     done
 
     if [[ -n "$LIB_CONFIG_PATH" ]];then

do-init/init-repo.sh

@@ -113,6 +113,7 @@ function apply_patches() {
 
     local patch_base_dir=$(dirname "$MR_LIB_CONFIG_PATH")
     local patch_dir="${patch_base_dir}/$PATCH_DIR"
+    patch_dir=$(make_absolute_path "$patch_dir")
     local patch_dirs=(
         "$patch_dir"
         "${patch_dir}-${MR_PLAT}"

do-init/main.sh

@@ -46,7 +46,9 @@ function parse_args() {
 
 function do_init_a_lib()
 {
-    local lib_config="$1"    
+    local lib_config="$1"
+    lib_config=$(make_absolute_path "$lib_config")
+    [[ ! -f "$lib_config" ]] && (echo "❌$lib_config config not exist,init will stop.";exit 1;) 
     echo "===[init $lib_config]===================="
     [[ ! -f "$lib_config" ]] && (echo "❌$lib_config config not exist,init will stop.";exit 1;)
     source "$lib_config"
@@ -62,7 +64,7 @@ function main() {
 
     for lib in $MR_VENDOR_LIBS
     do
-        do_init_a_lib "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh"
+        do_init_a_lib "configs/libs/${lib}.sh"
     done
 
     if [[ -n "$LIB_CONFIG_PATH" ]];then

do-install/main.sh

@@ -50,6 +50,7 @@ function parse_lib_config() {
 function do_install_a_lib()
 {
     local lib_config="$1"
+    lib_config=$(make_absolute_path "$lib_config")
     [[ ! -f "$lib_config" ]] && (echo "❌$lib_config config not exist,install will stop."; exit 1;)
 
     echo "===[install $lib_config]===================="
@@ -68,7 +69,7 @@ function install_libs()
     # 循环安装所有的库
     for lib in $MR_VENDOR_LIBS
     do
-        do_install_a_lib "$MR_SHELL_CONFIGS_DIR/libs/${lib}.sh"
+        do_install_a_lib "configs/libs/${lib}.sh"
     done
 
     if [[ -n "$LIB_CONFIG_PATH" ]];then

tools/parse-arguments.sh

@@ -121,8 +121,19 @@ function echo_env()
     fi
 }
 
+function make_absolute_path()
+{
+    local p="$1"
+    if [[ $p == /* ]]; then
+        echo "$(cd "$(dirname "$p")" && pwd)/$(basename "$p")"
+    else
+        echo "$(cd "$(dirname "$MR_SHELL_ROOT_DIR/$p")" && pwd)/$(basename "$p")"
+    fi
+}
+
 export -f env_assert
 export -f echo_env
+export -f make_absolute_path
 
 function help()
 {