update shell

Author: debugly

README.md

@@ -75,19 +75,19 @@ At present MRFFToolChain contained OpenSSL、FFmpeg 、libyuv、libopus、libblu
 
 ```
 #准备 iOS 和 macOS 平台所有库的源码
-./init-all.sh all
+./init-any.sh all
 #准备 iOS 平台源码所有库的源码
-./init-all.sh ios
+./init-any.sh ios
 #准备 iOS 平台x86架构下所有库的源码
-./init-all.sh ios all x86_64
+./init-any.sh ios all x86_64
 #准备 macOS 平台源码所有库的源码
-/init-all.sh macos
+/init-any.sh macos
 #准备 ios 平台的某些库的源码
-/init-all.sh ios "openssl ffmpeg"
+/init-any.sh ios "openssl ffmpeg"
 #准备 macOS 平台的某些库的源码
-/init-all.sh macos "openssl ffmpeg"
+/init-any.sh macos "openssl ffmpeg"
 #准备 iOS 和 macOS 平台的某些库的源码
-/init-all.sh all "openssl ffmpeg"
+/init-any.sh all "openssl ffmpeg"
 ```
 
 高级选项：
@@ -147,7 +147,7 @@ cd macos
 
 编译 ios 平台跟 macos 是一样的流程，只需要 cd 到 ios 目录操作即可。
 
-其实 ios 和 macos 均调用了 apple 目录下的脚本。
+实际上 ios 和 macos 均调用了 apple 目录下的脚本。
 
 ## Use Your Mirror
 

apple/compile-any.sh

@@ -25,8 +25,8 @@ OPTS=$5
 set -e
 
 # 当前脚本所在目录
-cd "$(dirname "$0")"
-SHELL_DIR="$PWD"
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+cd "$THIS_DIR"
 
 function usage() {
     echo " useage:"
@@ -60,8 +60,8 @@ if [[ -z "$CMD" ]]; then
     exit 1
 fi
 
-export XC_SRC_ROOT="${SHELL_DIR}/../build/src/${PLAT}"
-export XC_PRODUCT_ROOT="${SHELL_DIR}/../build/product/${PLAT}"
+export XC_SRC_ROOT="${THIS_DIR}/../build/src/${PLAT}"
+export XC_PRODUCT_ROOT="${THIS_DIR}/../build/product/${PLAT}"
 export XC_UNI_PROD_DIR="${XC_PRODUCT_ROOT}/universal"
 
 export XC_PLAT="$PLAT"

apple/do-compile/any.sh

@@ -18,8 +18,8 @@
 set -e
 
 # 当前脚本所在目录
-TOOLS=$(dirname "$0")
-source $TOOLS/../../tools/env_assert.sh
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+source $THIS_DIR/../../tools/env_assert.sh
 
 echo "=== [$0] check env begin==="
 env_assert "XC_CMD"

apple/do-compile/bluray.sh

@@ -17,8 +17,8 @@
 
 set -e
 
-TOOLS=$(dirname "$0")
-source $TOOLS/../../tools/env_assert.sh
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+source $THIS_DIR/../../tools/env_assert.sh
 
 echo "=== [$0] check env begin==="
 env_assert "XC_ARCH"

apple/do-compile/dav1d.sh

@@ -17,8 +17,8 @@
 
 set -e
 
-TOOLS=$(dirname "$0")
-source $TOOLS/../../tools/env_assert.sh
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+source $THIS_DIR/../../tools/env_assert.sh
 
 echo "=== [$0] check env begin==="
 env_assert "XC_ARCH"

apple/do-compile/ffmpeg.sh

@@ -20,8 +20,8 @@
 
 set -e
 
-TOOLS=$(dirname "$0")
-source $TOOLS/../../tools/env_assert.sh
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+source $THIS_DIR/../../tools/env_assert.sh
 
 echo "=== [$0] check env begin==="
 env_assert "XC_TAGET_OS"
@@ -36,7 +36,7 @@ echo "XC_OPTS:$XC_OPTS"
 echo "===check env end==="
 
 # ffmpeg build params
-source $(pwd)/../ffconfig/module.sh
+source $THIS_DIR/../../ffconfig/module.sh
 FFMPEG_CFG_FLAGS="$COMMON_FF_CFG_FLAGS"
 
 FFMPEG_CFG_FLAGS="--prefix=$XC_BUILD_PREFIX $FFMPEG_CFG_FLAGS"

apple/do-compile/libyuv.sh

@@ -17,8 +17,8 @@
 
 set -e
 
-TOOLS=$(dirname "$0")
-source $TOOLS/../../tools/env_assert.sh
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+source $THIS_DIR/../../tools/env_assert.sh
 
 echo "=== [$0] check env begin==="
 env_assert "XC_ARCH"

apple/do-compile/openssl.sh

@@ -21,8 +21,8 @@
 
 set -e
 
-TOOLS=$(dirname "$0")
-source $TOOLS/../../tools/env_assert.sh
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+source $THIS_DIR/../../tools/env_assert.sh
 
 echo "=== [$0] check env begin==="
 env_assert "XC_ARCH"

apple/do-compile/opus.sh

@@ -17,8 +17,8 @@
 
 set -e
 
-TOOLS=$(dirname "$0")
-source $TOOLS/../../tools/env_assert.sh
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+source $THIS_DIR/../../tools/env_assert.sh
 
 echo "=== [$0] check env begin==="
 env_assert "XC_ARCH"

download-pre.sh

@@ -24,8 +24,8 @@ if test -z $PLAT ;then
     PLAT='all'
 fi
 
-cd $(dirname "$0")
-c_dir="$PWD"
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+cd "$THIS_DIR"
 
 function usage() {
     echo "=== useage ===================="

init-any.sh

@@ -29,8 +29,8 @@ ARCH=$3
 
 set -e
 
-cd $(dirname "$0")
-c_dir="$PWD"
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+cd "$THIS_DIR"
 
 function usage()
 {
@@ -51,11 +51,11 @@ if [[ "x$LIBS" == "x" || "$LIBS" == "all" ]]; then
 fi
 
 if [[ "$PLAT" == 'ios' || "$PLAT" == 'macos' || "$PLAT" == 'all' ]]; then
-    source "$c_dir/version.sh"
+    source "$THIS_DIR/version.sh"
     for lib in $LIBS
     do
         echo "===[init $lib]===================="
-        $c_dir/tools/init-repo.sh "$c_dir/init-cfgs/$lib" "$PLAT" "$ARCH"
+        $THIS_DIR/tools/init-repo.sh "$THIS_DIR/init-cfgs/$lib" "$PLAT" "$ARCH"
         echo "===================================="
     done
 else

ios/compile-any.sh

@@ -18,5 +18,7 @@
 set -e
 
 # 当前脚本所在目录
-cd "$(dirname "$0")"
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+cd "$THIS_DIR"
+
 ../apple/compile-any.sh ios $*

macos/compile-any.sh

@@ -18,6 +18,7 @@
 set -e
 
 # 当前脚本所在目录
-cd "$(dirname "$0")"
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+cd "$THIS_DIR"
 
 ../apple/compile-any.sh macos $*

tools/init-repo.sh

@@ -20,8 +20,8 @@ set -e
 
 source $1
 
-TOOLS=$(dirname "$0")
-source ${TOOLS}/env_assert.sh
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+source ${THIS_DIR}/env_assert.sh
 
 echo "===check env begin==="
 echo "argv:[$*]"
@@ -86,7 +86,7 @@ function apply_patches() {
     fi
 
     local plat="$1"
-    local patch_dir="${TOOLS}/../extra/patches/$REPO_DIR"
+    local patch_dir="${THIS_DIR}/../extra/patches/$REPO_DIR"
 
     if [[ -d "${patch_dir}_${plat}" ]]; then
         patch_dir="${patch_dir}_${plat}"
@@ -107,7 +107,7 @@ function apply_patches() {
 function make_arch_repo() {
     local dest_repo="build/src/$1/$REPO_DIR-$2"
     echo "== copy $REPO_DIR → $dest_repo =="
-    $TOOLS/copy-local-repo.sh $GIT_LOCAL_REPO $dest_repo
+    $THIS_DIR/copy-local-repo.sh $GIT_LOCAL_REPO $dest_repo
     cd $dest_repo
     if [[ "$GIT_WITH_SUBMODULE" ]]; then
         git submodule update --init --depth=1

version.sh

@@ -1 +1 @@
-export IJK_VERSION=0.10.1
+export IJK_VERSION=0.10.3