[Bigdata-commit] SF.net SVN: bigdata:[8151] branches/RDR

[<dme...@us...>]

Revision: 8151
          http://sourceforge.net/p/bigdata/code/8151
Author:   dmekonnen
Date:     2014-04-30 17:52:58 +0000 (Wed, 30 Apr 2014)
Log Message:
-----------
additional refinements following feedkback.

Modified Paths:
--------------
    branches/RDR/bigdata/src/resources/deployment/brew/bigdata.rb
    branches/RDR/src/resources/deployment/nss/bin/bigdata

Modified: branches/RDR/bigdata/src/resources/deployment/brew/bigdata.rb
===================================================================
--- branches/RDR/bigdata/src/resources/deployment/brew/bigdata.rb	2014-04-30 15:45:05 UTC (rev 8150)
+++ branches/RDR/bigdata/src/resources/deployment/brew/bigdata.rb	2014-04-30 17:52:58 UTC (rev 8151)
@@ -1,59 +1,30 @@
-require 'formula'
+require "formula"
 
 class Bigdata < Formula
-  homepage 'http://bigdata.com/blog/'
-  url 'http://bigdata.com/deploy/bigdata-1.3.0.tgz'
-  sha1 '5bfec0cfe47139dc0ab3ead7f61d5fc156b57bb9'
+  homepage "http://bigdata.com/blog/"
+  url "http://bigdata.com/deploy/bigdata-1.3.0.tgz"
+  sha1 "c22fa05df965019b3132161507ce0e77a4a1f6e2"
 
   def install
-    prefix.install Dir['*']
+    prefix.install "doc"
+    prefix.install "var"
+    prefix.install "bin"
+    libexec.install "lib"
 
-    # make brew happy and rename the "lib" directory:
-    system "mv #{lib} #{libexec}"
-
     # Set the installation path as the root for the bin scripts:
-    system "sed -i .bak 's|<%= BD_HOME %>|#{prefix}|' #{bin}/bigdata"
-    system "sed -i .bak 's|<%= INSTALL_TYPE %>|BREW|' #{bin}/bigdata ; rm #{bin}/bigdata.bak"
+    inreplace "#{bin}/bigdata", "<%= BD_HOME %>", prefix
+    inreplace "#{bin}/bigdata", "<%= INSTALL_TYPE %>", "BREW"
 
-
     # Set the Jetty root as the resourceBase in the jetty.xml file:
-    system "sed -i .bak 's|<%= JETTY_DIR %>|#{prefix}/var/jetty|' #{prefix}/var/jetty/etc/jetty.xml ; rm #{prefix}/var/jetty/etc/jetty.xml.bak"
+    inreplace "#{prefix}/var/jetty/etc/jetty.xml", "<%= JETTY_DIR %>", "#{prefix}/var/jetty"
 
     # Set the installation path as the root for bigdata.jnl file location (<bigdata_home>/data):
-    system "sed -i .bak 's|<%= BD_HOME %>|#{prefix}|' #{prefix}/var/jetty/WEB-INF/RWStore.properties ; rm #{prefix}/var/jetty/WEB-INF/RWStore.properties.bak"
+    inreplace "#{prefix}/var/jetty/WEB-INF/RWStore.properties", "<%= BD_HOME %>", prefix
 
     # Set the installation path as the root for log files (<bigdata_home>/log):
-    system "sed -i .bak 's|<%= BD_HOME %>|#{prefix}|' #{prefix}/var/jetty/WEB-INF/classes/log4j.properties; rm #{prefix}/var/jetty/WEB-INF/classes/log4j.properties.bak "
+    inreplace "#{prefix}/var/jetty/WEB-INF/classes/log4j.properties", "<%= BD_HOME %>", prefix
   end
 
-  def caveats; <<-EOS.undent
-     After launching, visit the Bigdata Workbench at:
-
-       http://localhost:8080/bigdata
-
-     "bigdata" command synopis:
-     -------------------------
-
-     Start the server:
-
-          % bigdata start
-
-     Stop the server:
-
-          % bigdata stop
-
-     Restart the server:
-
-          % bigdata restart
-
-     To tune the server configuration, edit the "#{prefix}/var/jetty/WEB-INF/RWStore.properties" file.
-
-     Further documentation:
-
-          #{prefix}/doc
-    EOS
-  end
-
   plist_options :startup => 'true', :manual => 'bigdata start'
 
   def plist; <<-EOS.undent

Modified: branches/RDR/src/resources/deployment/nss/bin/bigdata
===================================================================
--- branches/RDR/src/resources/deployment/nss/bin/bigdata	2014-04-30 15:45:05 UTC (rev 8150)
+++ branches/RDR/src/resources/deployment/nss/bin/bigdata	2014-04-30 17:52:58 UTC (rev 8151)
@@ -24,8 +24,8 @@
 #
 # the following template line will be replaced by a deployer application (e.g. brew, chef)
 #
-export INSTALL_TYPE="BREW"
-export BD_HOME="/usr/local/Cellar/bigdata/1.3.0"
+export INSTALL_TYPE="<%= INSTALL_TYPE %>"
+export BD_HOME="<%= BD_HOME %>"
 pidFile=${BD_HOME}/var/lock/pid
 binDir=${BD_HOME}/bin
 
@@ -101,6 +101,7 @@
 #
 # Usage
 #
+	me=`basename $0`
         echo $"Usage: $0 {start|stop|status|restart}"
         exit 1
 esac

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.