You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2012/03/02 16:50:31 UTC
svn commit: r1296260 - in /incubator/accumulo/branches/1.4/src/packages/deb:
accumulo-native/postinst accumulo/postinst accumulo/postrm
Author: vines
Date: Fri Mar 2 15:50:30 2012
New Revision: 1296260
URL: http://svn.apache.org/viewvc?rev=1296260&view=rev
Log:
ACCUMULO-435 - handles improper JAVA_HOME settings. Also cleared up getcwd errors and siwtched walogs to a more appropriate directory
Modified:
incubator/accumulo/branches/1.4/src/packages/deb/accumulo-native/postinst
incubator/accumulo/branches/1.4/src/packages/deb/accumulo/postinst
incubator/accumulo/branches/1.4/src/packages/deb/accumulo/postrm
Modified: incubator/accumulo/branches/1.4/src/packages/deb/accumulo-native/postinst
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/packages/deb/accumulo-native/postinst?rev=1296260&r1=1296259&r2=1296260&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/packages/deb/accumulo-native/postinst (original)
+++ incubator/accumulo/branches/1.4/src/packages/deb/accumulo-native/postinst Fri Mar 2 15:50:30 2012
@@ -16,7 +16,7 @@
# limitations under the License.
# postinst script for Apache Accumulo native libraries
-if [ -z $JAVA_HOME ]; then
+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`
Modified: incubator/accumulo/branches/1.4/src/packages/deb/accumulo/postinst
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/packages/deb/accumulo/postinst?rev=1296260&r1=1296259&r2=1296260&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/packages/deb/accumulo/postinst (original)
+++ incubator/accumulo/branches/1.4/src/packages/deb/accumulo/postinst Fri Mar 2 15:50:30 2012
@@ -22,11 +22,11 @@ mv -f /usr/lib/accumulo/conf/* /etc/accu
rm -Rf /usr/lib/accumulo/conf
ln -fs /etc/accumulo/conf /usr/lib/accumulo/conf
mkdir -p /var/log/accumulo/logs
-mkdir -p /var/log/accumulo/walogs
+mkdir -p /var/lib/accumulo/walogs
ln -fs /var/log/accumulo/logs /usr/lib/accumulo/logs
-ln -fs /var/log/accumulo/walogs /usr/lib/accumulo/walogs
+ln -fs /var/lib/accumulo/walogs /usr/lib/accumulo/walogs
-if [ -z $JAVA_HOME ]; then
+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`
Modified: incubator/accumulo/branches/1.4/src/packages/deb/accumulo/postrm
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/packages/deb/accumulo/postrm?rev=1296260&r1=1296259&r2=1296260&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/packages/deb/accumulo/postrm (original)
+++ incubator/accumulo/branches/1.4/src/packages/deb/accumulo/postrm Fri Mar 2 15:50:30 2012
@@ -16,13 +16,13 @@
# limitations under the License.
# postrm script for Apache Accumulo
+rm -f /usr/lib/accumulo/conf
rm -f /usr/lib/accumulo/logs
rm -f /usr/lib/accumulo/walogs
-rm -f /usr/lib/accumulo/conf
-rm -f /usr/bin/accumulo
case "$1" in
purge)
rm -Rf /var/log/accumulo
+ rm -Rf /var/lib/accumulo
rm -Rf /etc/accumulo
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
@@ -33,4 +33,5 @@ case "$1" in
;;
esac
+rm -f /usr/bin/accumulo
exit 0