gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Use the new install script as make install target. Message about install script requiring root changed a bit to make it more evident."

Browse Source 
After talking with Pieter he changed my mind about this, it is better to
have a simpler install script that works everywhere, and the complex one
can be always executed if needed by hand. We'll make possibly a new
target for the full featured installation script, and even suggest it
after a Make install.

This reverts commit f1e60d75309990b25a1763e004d7044c77c53834.
This commit is contained in:
antirez 2011-10-03 16:04:44 +02:00
parent 37d650032a
commit 0bb5160cb0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile
View File

@ -236,4 +236,9 @@ src/help.h:
@../utils/generate-command-help.rb > help.h @../utils/generate-command-help.rb > help.h
install: all install: all
@../utils/install_server.sh mkdir -p $(INSTALL_BIN)
$(INSTALL) $(PRGNAME) $(INSTALL_BIN)
$(INSTALL) $(BENCHPRGNAME) $(INSTALL_BIN)
$(INSTALL) $(CLIPRGNAME) $(INSTALL_BIN)
$(INSTALL) $(CHECKDUMPPRGNAME) $(INSTALL_BIN)
$(INSTALL) $(CHECKAOFPRGNAME) $(INSTALL_BIN)

2
utils/install_server.sh
View File

@ -47,7 +47,7 @@ echo "This script will help you easily set up a running redis server
#check for root user TODO: replace this with a call to "id" #check for root user TODO: replace this with a call to "id"
if [ `whoami` != "root" ] ; then if [ `whoami` != "root" ] ; then
echo "ERROR: You must run this installation script as root. Sorry!\n" echo "You must run this script as root. Sorry!"
exit 1 exit 1
fi fi