You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by cj...@apache.org on 2013/05/13 17:34:37 UTC
svn commit: r1481928 - in /accumulo/trunk: ./ bin/bootstrap_config.sh
Author: cjnolet
Date: Mon May 13 15:34:37 2013
New Revision: 1481928
URL: http://svn.apache.org/r1481928
Log:
Applying patch ACCUMULO-1401
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/bin/bootstrap_config.sh
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1481700-1481853,1481855-1481926
Modified: accumulo/trunk/bin/bootstrap_config.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/bootstrap_config.sh?rev=1481928&r1=1481927&r2=1481928&view=diff
==============================================================================
--- accumulo/trunk/bin/bootstrap_config.sh (original)
+++ accumulo/trunk/bin/bootstrap_config.sh Mon May 13 15:34:37 2013
@@ -76,4 +76,9 @@ echo "Initializing default configuration
#
# Perform a copy with update here to not overwrite existing files
#
-cp -vu ${CONF_DIR}/* ${ACCUMULO_HOME}/conf
+if ! `type -p "cp -u"`; then
+ CP=rsync
+else
+ CP=cp
+fi
+$CP -vu ${CONF_DIR}/* ${ACCUMULO_HOME}/conf
\ No newline at end of file