Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C01FE803 for ; Wed, 2 Jan 2013 22:48:28 +0000 (UTC) Received: (qmail 30622 invoked by uid 500); 2 Jan 2013 22:48:28 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 30572 invoked by uid 500); 2 Jan 2013 22:48:28 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 30565 invoked by uid 99); 2 Jan 2013 22:48:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 22:48:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 22:48:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 74E2B23889D7; Wed, 2 Jan 2013 22:48:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1428098 - in /accumulo/branches/1.4: pom.xml src/packages/deb/accumulo-native/postinst src/packages/deb/accumulo/postinst Date: Wed, 02 Jan 2013 22:48:05 -0000 To: commits@accumulo.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130102224805.74E2B23889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vines Date: Wed Jan 2 22:48:04 2013 New Revision: 1428098 URL: http://svn.apache.org/viewvc?rev=1428098&view=rev Log: ACCUMULO-789 - went through debian scripts and gave them some overall loving. They should run well now Modified: accumulo/branches/1.4/pom.xml accumulo/branches/1.4/src/packages/deb/accumulo-native/postinst accumulo/branches/1.4/src/packages/deb/accumulo/postinst Modified: accumulo/branches/1.4/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/pom.xml?rev=1428098&r1=1428097&r2=1428098&view=diff ============================================================================== --- accumulo/branches/1.4/pom.xml (original) +++ accumulo/branches/1.4/pom.xml Wed Jan 2 22:48:04 2013 @@ -396,6 +396,15 @@ **/.svn/**,**/accumulo-site.xml,**/accumulo-env.sh,**/accumulo-metrics.xml,**/test-*,**/slaves,**/masters,**/tracers,**/gc,**/monitor + + conf/examples + directory + + perm + /usr/lib/accumulo/conf/examples + + **/.svn/** + Modified: accumulo/branches/1.4/src/packages/deb/accumulo-native/postinst URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/packages/deb/accumulo-native/postinst?rev=1428098&r1=1428097&r2=1428098&view=diff ============================================================================== --- accumulo/branches/1.4/src/packages/deb/accumulo-native/postinst (original) +++ accumulo/branches/1.4/src/packages/deb/accumulo-native/postinst Wed Jan 2 22:48:04 2013 @@ -16,11 +16,19 @@ # limitations under the License. # postinst script for Apache Accumulo native libraries +echo JAVA HOME IS $JAVA_HOME if [ -z "$JAVA_HOME" -o ! -f "$JAVA_HOME/jre/bin/" ] ; then JAVA_HOME=`readlink -f /usr/bin/java` JAVA_HOME=`dirname $JAVA_HOME` - JAVA_HOME=`cd $JAVA_HOME/../../; pwd` + JAVA_HOME=`cd $JAVA_HOME/../; pwd` fi export JAVA_HOME +export PATH=$PATH:$JAVA_HOME/bin +echo $JAVA_HOME +echo $PATH cd /usr/lib/accumulo/src/server/src/main/c++ make + +if [ $? -ne 0 ]; then + echo "Issues building native libraries. Make sure root has javah on it's classpath" +fi Modified: accumulo/branches/1.4/src/packages/deb/accumulo/postinst URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/packages/deb/accumulo/postinst?rev=1428098&r1=1428097&r2=1428098&view=diff ============================================================================== --- accumulo/branches/1.4/src/packages/deb/accumulo/postinst (original) +++ accumulo/branches/1.4/src/packages/deb/accumulo/postinst Wed Jan 2 22:48:04 2013 @@ -37,7 +37,7 @@ fi if [ -z $HADOOP_HOME ]; then HADOOP_HOME="/usr/lib/hadoop" fi -for files in `ls /etc/accumulo/conf/accumulo-env.sh.*`; do +for files in `ls /etc/accumulo/conf/examples/*/*/accumulo-env.sh`; do sed -i -e "s:/path/to/java:$JAVA_HOME:" $files sed -i -e "s:/path/to/zookeeper:$ZOOKEEPER_HOME:" $files sed -i -e "s:/path/to/hadoop:$HADOOP_HOME:" $files