Ubuntu + Debian build fixes (#2247) (#2248)

tools/deployment/make_linux_package.sh

@@ -25,7 +25,8 @@ PACKAGE_NAME="osquery"
 if [[ $PACKAGE_VERSION == *"-"* ]]; then
   DESCRIPTION="$DESCRIPTION (unstable/latest version)"
 fi
-OUTPUT_PKG_PATH="$BUILD_DIR/$PACKAGE_NAME-$PACKAGE_VERSION."
+
+OUTPUT_PKG_PATH="$BUILD_DIR/${PACKAGE_NAME}-${PACKAGE_VERSION}."
 
 # Config files
 INITD_SRC="$SCRIPT_DIR/osqueryd.initd"
@@ -163,6 +164,12 @@ function main() {
     FPM="/var/lib/gems/1.8/bin/fpm"
   fi
 
+# some tune to stay compliant with Debian package naming convention
+  if [[ $PACKAGE_TYPE == "deb" ]]; then
+    DEB_PACKAGE_ARCH=`dpkg --print-architecture`
+    OUTPUT_PKG_PATH="$BUILD_DIR/${PACKAGE_NAME}_${PACKAGE_VERSION}_${DEB_PACKAGE_ARCH}.deb"
+  fi
+
   POSTINST_CMD=""
   if [[ $OSQUERY_POSTINSTALL != "" ]] && [[ -f $OSQUERY_POSTINSTALL ]]; then
     POSTINST_CMD="--after-install $OSQUERY_POSTINSTALL"

tools/provision.sh

@@ -96,6 +96,8 @@ function main() {
   # Pip may have just been installed.
   PIP=`which pip`
   sudo $PIP install --upgrade pip
+  # Previos command may change pip path (/usr/bin/pip to /usr/bin/local/pip)
+  PIP=`which pip`
   sudo $PIP install -r requirements.txt
 
   initialize $OS

tools/provision/debian.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 function main_debian() {
-  sudo apt-get update -y --no-install-recommends
-  sudo apt-get upgrade -y --no-install-recommends
+  sudo apt-get update -y -q --no-install-recommends
+  sudo apt-get upgrade -y -q --no-install-recommends
 
   package git-core
   package wget

tools/provision/lib.sh

@@ -588,7 +588,7 @@ function package() {
       log "$1 is already installed. skipping."
     else
       log "installing $1"
-      sudo DEBIAN_FRONTEND=noninteractive apt-get install $1 -y --no-install-recommends
+      sudo DEBIAN_FRONTEND=noninteractive apt-get install $1 -y -q --no-install-recommends
     fi
   elif [[ $FAMILY = "redhat" ]]; then
     if [[ ! -n "$(rpm -V $1)" ]]; then

tools/provision/ubuntu.sh

@@ -43,6 +43,7 @@ function main_ubuntu() {
   package python-dev
   # package linux-headers-generic
   package ruby-dev
+  package ruby1.9.1-dev
   package gcc
   package doxygen