From: Helge Norberg <helge.norberg@svt.se>
Date: Fri, 19 Aug 2016 15:22:06 +0000 (+0200)
Subject: Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
X-Git-Tag: 2.1.0_Beta1~64
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c471e87cfc402308a0439642766d10a3b3dc4b20;hp=af4c83635bd3b2210816bdee5141d6e59c24d134;p=casparcg

Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
---

diff --git a/build-scripts/build-linux.sh b/build-scripts/build-linux.sh
index 0ee553c1a..338d9780a 100755
--- a/build-scripts/build-linux.sh
+++ b/build-scripts/build-linux.sh
@@ -44,10 +44,10 @@ mkdir "$SERVER_FOLDER/lib" || fail "Could not create $SERVER_FOLDER/lib"
 echo Copying binaries...
 cp -f  shell/lib* "$SERVER_FOLDER/lib/" || fail "Could not copy server libraries"
 cp -f  shell/*.ttf "$SERVER_FOLDER/" || fail "Could not copy font(s)"
-cp -f  shell/*.pak "$SERVER_FOLDER/" || fail "Could not copy font(s)"
 cp -f  shell/casparcg "$SERVER_FOLDER/bin/" || fail "Could not copy server executable"
 cp -f  shell/casparcg.config "$SERVER_FOLDER/" || fail "Could not copy server config"
 cp -Rf shell/locales "$SERVER_FOLDER/bin/" || fail "Could not copy server CEF locales"
+cp -f  shell/*.pak "$SERVER_FOLDER/" || fail "Could not copy CEF resources"
 
 # Copy binary dependencies
 echo Copying binary dependencies...