base-files: automatically handle paths and symlinks for RAMFS_COPY_BIN

[openwrt/staging/wigyori.git] / package / base-files / files / lib / upgrade / common.sh

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index c8b71015c2e44210696a4e28a5b7babbd0233184..428ec735d62e8a2fd7cad973dacc20c0a81b5826 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -6,28 +6,33 @@ RAM_ROOT=/tmp/root
 libs() { ldd $* 2>/dev/null | sed -r 's/(.* => )?(.*) .*/\2/'; }
 
 install_file() { # <file> [ <file> ... ]
+       local target dest dir
        for file in "$@"; do
+               if [ -L "$file" ]; then
+                       target="$(readlink -f "$file")"
+                       dest="$RAM_ROOT/$file"
+                       [ ! -f "$dest" ] && {
+                               dir="$(dirname "$dest")"
+                               mkdir -p "$dir"
+                               ln -s "$target" "$dest"
+                       }
+                       file="$target"
+               fi
                dest="$RAM_ROOT/$file"
-               [ -f $file -a ! -f $dest ] && {
-                       dir="$(dirname $dest)"
+               [ -f "$file" -a ! -f "$dest" ] && {
+                       dir="$(dirname "$dest")"
                        mkdir -p "$dir"
-                       cp $file $dest
+                       cp "$file" "$dest"
                }
        done
 }
 
-install_bin() { # <file> [ <symlink> ... ]
+install_bin() {
+       local src files
        src=$1
        files=$1
        [ -x "$src" ] && files="$src $(libs $src)"
        install_file $files
-       shift
-       for link in "$@"; do {
-               dest="$RAM_ROOT/$link"
-               dir="$(dirname $dest)"
-               mkdir -p "$dir"
-               [ -f "$dest" ] || ln -s $src $dest
-       }; done
 }
 
 run_hooks() {