valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-08 10:23:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #144 from facebook/inline-sudo

Browse Source 
Use inline sudos for installs
This commit is contained in:
Teddy Reed 2014-09-17 09:28:12 -07:00
commit 9a04000f1b
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/FindRocksDB.cmake
View File

@ -12,5 +12,5 @@ ExternalProject_Add(librocksdb
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make shared_lib && make static_lib BUILD_COMMAND make shared_lib && make static_lib
INSTALL_COMMAND cp "${OS_ROCKSDB_INSTALL_LIB}" /usr/local/lib/ && cp librocksdb.a /usr/local/lib/ INSTALL_COMMAND sudo cp "${OS_ROCKSDB_INSTALL_LIB}" /usr/local/lib/ && sudo cp librocksdb.a /usr/local/lib/
) )

36
Makefile
View File

@ -58,33 +58,29 @@ ifeq ($(OS),Darwin)
brew install thrift || brew upgrade thrift brew install thrift || brew upgrade thrift
else else
if [ -f /etc/lsb-release ]; then \ if [ -f /etc/lsb-release ]; then \
apt-get update; \ sudo apt-get install git -y; \
apt-get upgrade -y; \ sudo apt-get install build-essential -y; \
apt-get install git -y; \ sudo apt-get install cmake -y; \
apt-get install build-essential -y; \ sudo apt-get install python-pip -y; \
apt-get install cmake -y; \ sudo apt-get install python-dev -y; \
apt-get install python-pip -y; \ sudo apt-get install clang-3.4 -y; \
apt-get install python-dev -y; \ sudo apt-get install clang-format-3.4 -y; \
apt-get install clang-3.4 -y; \ sudo apt-get install libboost1.55-all-dev -y; \
apt-get install clang-format-3.4 -y; \ sudo apt-get install libgflags-dev -y; \
apt-get install libboost1.55-all-dev -y; \ sudo apt-get install libgoogle-glog-dev -y; \
apt-get install libgflags-dev -y; \ sudo apt-get install libsnappy-dev -y; \
apt-get install libgoogle-glog-dev -y; \ sudo apt-get install libbz2-dev -y; \
apt-get install libsnappy-dev -y; \ sudo apt-get install libreadline-dev -y; \
apt-get install libbz2-dev -y; \
apt-get install libreadline-dev -y; \
elif [ -f /etc/centos-release ]; then \ elif [ -f /etc/centos-release ]; then \
yum update -y; \ sudo yum install git -y; \
yum install git -y; \ sudo yum install http://dl.atrpms.net/el6-x86_64/atrpms/testing/cmake-2.8.8-4.el6.x86_64.rpm -y; \
# http://pkgs.org/centos-6/atrpms-testing-x86_64/cmake-2.8.8-4.el6.x86_64.rpm.html
yum install http://dl.atrpms.net/el6-x86_64/atrpms/testing/cmake-2.8.8-4.el6.x86_64.rpm -y; \
fi; fi;
endif endif
deps: os_deps deps: os_deps
git submodule init git submodule init
git submodule update git submodule update
pip install -r requirements.txt sudo pip install -r requirements.txt
distclean: clean_tables distclean: clean_tables
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)