From: Elliot V <evoris@slcconline.edu>
Date: Fri, 7 Mar 2014 05:43:00 +0000 (-0600)
Subject: LP#1077811 Inconsistent INSTALL Instructions
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f1024961703cce732ed6fd1e5cb11dd96795e67e;p=evergreen%2Fmasslnc.git

LP#1077811 Inconsistent INSTALL Instructions

The preamble to the installation instructions, intended for
developers, is a bit unclear. The instructions describe actions
that should take place at two different points in the installation.

This commit moves the instructions to download and install the Dojo
Toolkit until after the opensrf Linux user already owns the
/openils directory. It also adds the appropriate note for non-devs
to skip this section.

Signed-off-by: Elliot V <evoris@slcconline.edu>
Signed-off-by: Remington Steed <rjs7@calvin.edu>
---

diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index fed6d84932..a480aecc06 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -57,19 +57,6 @@ source directory to generate the configure script and Makefiles:
 autoreconf -i
 ------------------------------------------------------------------------------
 
-After running `make install`, developers also need to install the Dojo Toolkit
-set of JavaScript libraries. The appropriate version of Dojo is included
-in Evergreen release tarballs. Developers should install the Dojo 1.3.3
-version of Dojo by issuing the following commands as the *opensrf* Linux
-account:
-
-[source, bash]
-------------------------------------------------------------------------------
-wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
-tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
-cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
-------------------------------------------------------------------------------
-
 Installing prerequisites
 ------------------------
 
@@ -194,6 +181,27 @@ change the ownership on the files:
 chown -R opensrf:opensrf /openils
 ------------------------------------------------------------------------------
 
+Additional Instructions for Developers
+--------------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, need to install the Dojo Toolkit
+set of JavaScript libraries. The appropriate version of Dojo is included in
+Evergreen release tarballs. Developers should install the Dojo 1.3.3 version
+of Dojo by issuing the following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+------------------------------------------------------------------------------
+
+
 Configure the Apache Web server
 -------------------------------