Merge branch 'fix/noid/travismysqlerror'

.travis.yml

@@ -8,10 +8,14 @@ env:
         - APP_NAME=passman
         - SERVER_FOLDER=server
         - CLOUD=nextcloud
+        - SERVER=nextcloud/travis_ci/master
     matrix:
         - DB=mysql
         - DB=sqlite
 
+#fixes mysqlerrors
+dist: precise
+
 branches:
   only:
     - master
@@ -22,12 +26,15 @@ services:
   # enable a display for running JavaScript tests
   - xvfb
 
-before_install:
+
+  # enable a display for running JavaScript tests
+    #- export DISPLAY=:99.0
+   # - sh -e /etc/init.d/xvfb start
+   # - if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi
     - if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi
     # - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-    - sh -c "if [ '$CLOUD' = 'nextcloud' ]; then wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh; fi;"
-    - sh -c "if [ '$CLOUD' = 'owncloud' ]; then wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh; fi;"
-    - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+    - wget https://raw.githubusercontent.com/$SERVER/before_install.sh
+    - . ./before_install.sh "$APP_NAME" "$CORE_BRANCH" "$DB"
      # Add some output debugging information
     - cd ../${SERVER_FOLDER}
     - ./occ check