Add --no-mysql to checkout-deps.sh

.travis.yml

@@ -4,7 +4,7 @@ compiler:
 before_script:
   - sudo apt-get update -qq
   - sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev
-  - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh && cd $CHECKOUT_DIR
+  - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh --no-mysql && cd $CHECKOUT_DIR
 script:
   - mkdir build && cd build
   - python ../configure.py --enable-optimize --no-mysql

support/checkout-deps.sh

@@ -1,49 +1,51 @@
 #!/usr/bin/env bash
 trap "exit" INT
 
-ismac=0
-iswin=0
-
-archive_ext=tar.gz
-decomp="tar zxf"
-
-if [ `uname` = "Darwin" ]; then
-  ismac=1
-elif [ `uname` != "Linux" ] && [ -n "${COMSPEC:+1}" ]; then
-  iswin=1
-  archive_ext=zip
-  decomp=unzip
-fi
-
 if [ ! -d "amxmodx" ]; then
   git clone https://github.com/alliedmodders/amxmodx.git
 fi
 
-if [ $ismac -eq 1 ]; then
+if [ "$1" != "--no-mysql" ]; then
-  mysqlver=mysql-5.5.28-osx10.5-x86
+  ismac=0
-  mysqlurl=http://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext
+  iswin=0
-elif [ $iswin -eq 1 ]; then
-  mysqlver=mysql-noinstall-5.0.24a-win32
-  mysqlurl=http://cdn.mysql.com/archives/mysql-5.0/$mysqlver.$archive_ext
-  # The folder in the zip archive does not contain the substring "-noinstall", so strip it
-  mysqlver=${mysqlver/-noinstall}
-else
-  mysqlver=mysql-5.6.15-linux-glibc2.5-i686
-  mysqlurl=http://cdn.mysql.com/archives/mysql-5.6/$mysqlver.$archive_ext
-fi
 
-if [ ! -d "mysql-5.0" ]; then
+  archive_ext=tar.gz
-  if [ `command -v wget` ]; then
+  decomp="tar zxf"
-    wget $mysqlurl -O mysql.$archive_ext
+
-  elif [ `command -v curl` ]; then
+  if [ `uname` = "Darwin" ]; then
-    curl -o mysql.$archive_ext $mysqlurl
+    ismac=1
-  else
+  elif [ `uname` != "Linux" ] && [ -n "${COMSPEC:+1}" ]; then
-    echo "Failed to locate wget or curl. Install one of these programs to download MySQL."
+    iswin=1
-    exit 1
+    archive_ext=zip
+    decomp=unzip
+  fi
+
+  if [ $ismac -eq 1 ]; then
+    mysqlver=mysql-5.5.28-osx10.5-x86
+    mysqlurl=http://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext
+  elif [ $iswin -eq 1 ]; then
+    mysqlver=mysql-noinstall-5.0.24a-win32
+    mysqlurl=http://cdn.mysql.com/archives/mysql-5.0/$mysqlver.$archive_ext
+    # The folder in the zip archive does not contain the substring "-noinstall", so strip it
+    mysqlver=${mysqlver/-noinstall}
+  else
+    mysqlver=mysql-5.6.15-linux-glibc2.5-i686
+    mysqlurl=http://cdn.mysql.com/archives/mysql-5.6/$mysqlver.$archive_ext
+  fi
+
+  if [ ! -d "mysql-5.0" ]; then
+    if [ `command -v wget` ]; then
+      wget $mysqlurl -O mysql.$archive_ext
+    elif [ `command -v curl` ]; then
+      curl -o mysql.$archive_ext $mysqlurl
+    else
+      echo "Failed to locate wget or curl. Install one of these programs to download MySQL."
+      exit 1
+    fi
+    $decomp mysql.$archive_ext
+    mv $mysqlver mysql-5.0
+    rm mysql.$archive_ext
   fi
-  $decomp mysql.$archive_ext
-  mv $mysqlver mysql-5.0
-  rm mysql.$archive_ext
 fi
 
 checkout ()