summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorJonathan Bauer2013-01-08 17:24:12 +0100
committerJonathan Bauer2013-01-08 17:24:12 +0100
commit6e8e9564ae2eab9ffb029f30f030bceade98856d (patch)
tree444641f55911eff6e6a9858806044801f6df0a3d /remote
parent[plymouth] simple theme (diff)
parentexclude static .a files (diff)
downloadtm-scripts-6e8e9564ae2eab9ffb029f30f030bceade98856d.tar.gz
tm-scripts-6e8e9564ae2eab9ffb029f30f030bceade98856d.tar.xz
tm-scripts-6e8e9564ae2eab9ffb029f30f030bceade98856d.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
-rw-r--r--remote/.setup_tools.swpbin16384 -> 20480 bytes
-rwxr-xr-xremote/setup_tools4
2 files changed, 2 insertions, 2 deletions
diff --git a/remote/.setup_tools.swp b/remote/.setup_tools.swp
index 0fc6deed..4a7357e2 100644
--- a/remote/.setup_tools.swp
+++ b/remote/.setup_tools.swp
Binary files differ
diff --git a/remote/setup_tools b/remote/setup_tools
index ebfb1995..eeb13150 100755
--- a/remote/setup_tools
+++ b/remote/setup_tools
@@ -99,7 +99,7 @@ copyfileswithdependencies ()
for ENTRY in ${REQUIRED_DIRECTORIES}
do
echo ".${ENTRY}" >> ${COPYFILES_LIST}
- for LIB in $(find .${ENTRY} -type f | xargs grep -l ELF)
+ for LIB in $(find .${ENTRY} -type f -not -name "*.a" | xargs grep -l ELF)
do
for i in $(ldd ${LIB} |awk '{print $1 $2 $3}'|grep -v ld-linux|grep -v libc.so*|grep -v linux-gate)
do
@@ -116,7 +116,7 @@ copyfileswithdependencies ()
done
else
echo "Did not found ${arrIN[0]} in $(pwd)"
- if [ -e ${arrIN[1]} ];
+ if [ ! -z ${arrIN[1]} ];
then
echo -n "Trying ${arrIN[1]} ..."
echo " found! Copying."