summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-11-10 06:49:31 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-11-10 10:55:01 -0800
commit6dd6764b6beec448a66be8c03e261bad7b1a44c7 (patch)
tree3606ba1c6a48956f12d00bec203acc42796e336a
parentd1d4b4edb11de05294ba2502f1b87506d24c23f1 (diff)
downloadsubsurface-6dd6764b6beec448a66be8c03e261bad7b1a44c7.tar.gz
Travis: find googlemaps plugin at the new spot
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--scripts/linux/travisbuild.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/linux/travisbuild.sh b/scripts/linux/travisbuild.sh
index d764d625e..987d71ba2 100644
--- a/scripts/linux/travisbuild.sh
+++ b/scripts/linux/travisbuild.sh
@@ -22,7 +22,9 @@ env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build check
# set up the appdir
mkdir -p appdir/usr/plugins/
-mv appdir/usr/home/travis/build/*/subsurface/Qt/*/plugins/* appdir/usr/plugins/
+
+# mv googlemaps and Grantlee plugins into place
+mv appdir/usr/usr/local/Qt*/plugins/* appdir/usr/plugins # the usr/usr is not a typo - that's where it ends up
mv appdir/usr/lib/grantlee/ appdir/usr/plugins/
sudo mv appdir/usr/lib/* /usr/local/lib/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/160
rm -rf appdir/usr/home/ appdir/usr/include/ appdir/usr/share/man/ # No need to ship developer and man files as part of the AppImage