Remove various provision files (#2406)

tools/provision.sh

@@ -12,10 +12,7 @@ set -e
 # Helpful defines for the provisioning process.
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BUILD_DIR="$SCRIPT_DIR/../build"
-WORKING_DIR="/tmp/osquery-provisioning" # no longer needed
-FILES_DIR="$SCRIPT_DIR/provision/files" # maybe needed
 FORMULA_DIR="$SCRIPT_DIR/provision/formula"
-DEPS_URL=https://osquery-packages.s3.amazonaws.com/deps # no longer needed
 
 HOMEBREW_REPO="https://github.com/Homebrew/brew"
 LINUXBREW_REPO="https://github.com/Linuxbrew/brew"
@@ -54,7 +51,6 @@ function main() {
   fi
 
   # Setup the local ./build/DISTRO cmake build directory.
-  mkdir -p "$WORKING_DIR"
   if [[ ! -z "$SUDO_USER" ]]; then
     echo "chown -h $SUDO_USER $BUILD_DIR/*"
     chown -h $SUDO_USER:$SUDO_GID "$BUILD_DIR" || true

tools/provision/files/RPM-GPG-KEY-EPEL

@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----

tools/provision/files/centos6.devtools-2.repo

@@ -1,5 +0,0 @@
-[testing-devtools-2-centos-$releasever]
-name=testing 2 devtools for CentOS $releasever 
-baseurl=http://people.centos.org/tru/devtools-2/$releasever/$basearch/RPMS
-gpgcheck=0
-

tools/provision/files/oracle5.epel.repo

@@ -1,26 +0,0 @@
-[epel]
-name=Extra Packages for Enterprise Linux 5 - $basearch
-#baseurl=http://download.fedoraproject.org/pub/epel/5/$basearch
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch
-failovermethod=priority
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL
-
-[epel-debuginfo]
-name=Extra Packages for Enterprise Linux 5 - $basearch - Debug
-#baseurl=http://download.fedoraproject.org/pub/epel/5/$basearch/debug
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-5&arch=$basearch
-failovermethod=priority
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL
-gpgcheck=1
-
-[epel-source]
-name=Extra Packages for Enterprise Linux 5 - $basearch - Source
-#baseurl=http://download.fedoraproject.org/pub/epel/5/SRPMS
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-5&arch=$basearch
-failovermethod=priority
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL
-gpgcheck=1

tools/provision/files/scientific6.devtoolset.repo

@@ -1,10 +0,0 @@
-[devtoolset]
-Name=Scientific Linux devtoolset - $basearch
-baseurl=http://ftp.scientificlinux.org/linux/scientific/6x/external_products/devtoolset/$basearch/
-        http://ftp1.scientificlinux.org/linux/scientific/6x/external_products/devtoolset/$basearch/
-        http://ftp2.scientificlinux.org/linux/scientific/6x/external_products/devtoolset/$basearch/
-
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl6
-

tools/provision/lib.sh

@@ -20,16 +20,8 @@ function setup_brew() {
     DUPES_COMMIT=$HOMEBREW_DUPES
   fi
 
-  # Check if DEPS directory exists.
-  DEPS="$1"
-  if [[ ! -d "$DEPS" ]]; then
-    log "the build directory: $DEPS does not exist"
-    sudo mkdir "$DEPS"
-    sudo chown $USER "$DEPS"
-  fi
-
   # Checkout new brew in local deps dir
-  FORMULA_TAP="$DEPS/Library/Taps/osquery/homebrew-osquery-local"
+  DEPS="$1"
   if [[ ! -d "$DEPS/.git" ]]; then
     log "setting up new brew in $DEPS"
     git clone $BREW_REPO "$DEPS"
@@ -44,6 +36,8 @@ function setup_brew() {
   # Always update the location of the local tap link.
   log "refreshing local tap: homebrew-osquery-local"
   mkdir -p "$DEPS/Library/Taps/osquery/"
+
+  FORMULA_TAP="$DEPS/Library/Taps/osquery/homebrew-osquery-local"
   if [[ ! -e "$FORMULA_TAP" ]]; then
     ln -sf "$FORMULA_DIR" "$FORMULA_TAP"
   fi
@@ -144,13 +138,13 @@ function brew_internal() {
 
   export HOMEBREW_OPTIMIZATION_LEVEL=-Os
   if [[ ! -z "$OSQUERY_BUILD_BOTTLES" && ! "$TYPE" = "upstream" ]]; then
-    $BREW bottle --skip-relocation "${FORMULA_TAP}/${TOOL}.rb"
+    $BREW bottle --skip-relocation "${FORMULA}"
   elif [[ "${INSTALLED}" = "NAN" || "${INSTALLED}" = "None" ]]; then
     log "brew package $TOOL installing new version: ${STABLE}"
     $BREW install $ARGS "${FORMULA}"
   elif [[ ! "${INSTALLED}" = "${STABLE}" || "${FROM_BOTTLE}" = "true" ]]; then
     log "brew package $TOOL upgrading to new version: ${STABLE}"
-    $BREW uninstall "${FORMULA}"
+    $BREW remove --force "${FORMULA}"
     $BREW install $ARGS "${FORMULA}"
   else
     log "brew package $TOOL is already installed: ${STABLE}"