diff --git a/.travis.yml b/.travis.yml
index 295e53d1504..e464cfe45a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,6 @@ env:
 cache:
       directories:
               - $HOME/hostdir/repocache
-before_cache:
-    - mv hostdir/repocache/* $HOME/repocache
-
 before_script:
     - common/travis/prepare.sh
     - common/travis/fetch_upstream.sh
diff --git a/common/travis/bootstrap.sh b/common/travis/bootstrap.sh
index 14af57062ba..79ab324a0a9 100755
--- a/common/travis/bootstrap.sh
+++ b/common/travis/bootstrap.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # bootstrap.sh
 
diff --git a/common/travis/build.sh b/common/travis/build.sh
index 3554113d0d5..9136bcdc841 100755
--- a/common/travis/build.sh
+++ b/common/travis/build.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # build.sh
 
@@ -11,3 +11,4 @@ for pkg in $(cat /tmp/templates); do
 	[ $? -eq 1 ] && exit 1
 done
 
+exit 0
diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh
index 1f7579a7038..3565984a81a 100755
--- a/common/travis/changed_templates.sh
+++ b/common/travis/changed_templates.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # changed_templates.sh
 
diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 47ab226d438..6f7a47a687a 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # changed_templates.sh
 
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 2f3e26d40f4..b7dfa548340 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # show_files.sh
 
diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh
index 582ebed9a94..8233ce2a352 100755
--- a/common/travis/xlint.sh
+++ b/common/travis/xlint.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # xlint.sh