aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorftrapero <frantracer@gmail.com>2017-06-27 15:53:30 +0200
committerftrapero <frantracer@gmail.com>2017-06-27 16:33:09 +0200
commitfa70485dc0b3c6cc1045bde65fbd46fc3fd670b4 (patch)
treef156fc930fcea64e892b667fd24e1a3e3588c565
parent2dd6ca0c8bf747f1f9b191027fc70fa1a404b164 (diff)
downloadnx-libs-fa70485dc0b3c6cc1045bde65fbd46fc3fd670b4.tar.gz
nx-libs-fa70485dc0b3c6cc1045bde65fbd46fc3fd670b4.tar.bz2
nx-libs-fa70485dc0b3c6cc1045bde65fbd46fc3fd670b4.zip
roll-tarball.sh: Fix resolution of symbolic links and removal of useless Mesa versions
-rwxr-xr-xroll-tarballs.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/roll-tarballs.sh b/roll-tarballs.sh
index b38b9abdd..caecc59a5 100755
--- a/roll-tarballs.sh
+++ b/roll-tarballs.sh
@@ -114,11 +114,11 @@ if [ "x$MODE" = "xfull" ]; then
# bring Mesa in shape, drop symlinks and move versioned Mesa-bundle to
# nx-X11/extras/Mesa. Deal with the Mesa.patches symlink/folder accordingly
- MESA_VERSION="$(readlink nx-X11/extras/Mesa | cut -d"_" -f2)"
- rm "nx-X11/extras/Mesa"
- rm "nx-X11/extras/Mesa.patches"
- mv "nx-X11/extras/Mesa_${MESA_VERSION}" "nx-X11/extras/Mesa"
- mv "nx-X11/extras/Mesa.patches_${MESA_VERSION}" "nx-X11/extras/Mesa.patches"
+ cp -Lr "nx-X11/extras/Mesa" "nx-X11/extras/tmpMesa"
+ cp -Lr "nx-X11/extras/Mesa.patches" "nx-X11/extras/tmpMesa.patches"
+ ls -d nx-X11/extras/* | grep -v "nx-X11/extras/tmpMesa*" | xargs rm -r
+ mv "nx-X11/extras/tmpMesa" "nx-X11/extras/Mesa"
+ mv "nx-X11/extras/tmpMesa.patches" "nx-X11/extras/Mesa.patches"
# shrink Mesa to what we really need (and nothing else)
rm -Rf "nx-X11/extras/Mesa/"{bin/,configs/,docs/,doxygen/,progs/,vms/,windows/,Makefile,Makefile.*,descrip.mms,mms-config.}