Run as non-opensrf user; Allow different opensrf_core.xml for autogen

Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/extras/autogen.sh b/Open-ILS/src/extras/autogen.sh
index acecbba..6be1941 100755 (executable)
--- a/Open-ILS/src/extras/autogen.sh
+++ b/Open-ILS/src/extras/autogen.sh
@@ -21,27 +21,25 @@ set -e
 # Throw an error for uninitialized variables
 set -u
 
-# ---------------------------------------------------------------------------
-# Make sure we're running as the correct user
-# ---------------------------------------------------------------------------
-[ $(whoami) != 'opensrf' ] && echo 'Must run as user "opensrf"' && exit;
-
 function usage {
        echo "";
-       echo "usage: $0 [-u]";
+       echo "usage: $0 [-c /path/to/opensrf_core.xml] [-u]";
        echo "";
        echo "Updates the Evergreen organization tree and fieldmapper IDL.";
        echo "Run this every time you change the Evergreen organization tree";
        echo "or update fm_IDL.xml";
        echo "";
        echo "Optional parameters:";
-       echo -e "  -u\t\tupdate proximity of library sites in organization tree";
-       echo -e "    \t\t(this is expensive for a large organization tree)";
+       echo -e "  -c\t\tpath to the core OpenSRF configuration file;"
+    echo -e "    \t\t  default: SYSCONFDIR/opensrf_core.xml";
+       echo -e "  -u\t\tupdate proximity of library sites in organization tree (deprecated)";
+       echo -e "    \t\t(this is expensive for a large organization tree, and uneccessary"
+       echo -e "    \t\tin modern versions)";
        echo "";
        echo "Examples:";
        echo "";
        echo "  Update organization tree and fieldmapper IDL:";
-       echo "    $0";
+       echo "    $0 -c ";
        echo "";
        echo "  Update organization tree and refresh proximity:";
        echo "    $0 -u";
@@ -54,12 +52,14 @@ cd "BINDIR"
 
 # Initialize our variables
 PROXIMITY="";
+c="SYSCONFDIR/opensrf_core.xml";
 
 # ---------------------------------------------------------------------------
 # Load the command line options and set the global vars
 # ---------------------------------------------------------------------------
 while getopts  "u h" flag; do
        case $flag in   
+               "c")            c="$OPTARG";;
                "u")            PROXIMITY="REFRESH";;
                "h")            usage && exit;;
        esac;
@@ -79,14 +79,14 @@ echo ""
 
 OUTFILE="$JSDIR/fmall.js"
 echo "Updating fieldmapper";
-perl -MOpenILS::Utils::Configure -e 'print OpenILS::Utils::Configure::fieldmapper();' > "$OUTFILE"
+perl -MOpenILS::Utils::Configure -e 'print OpenILS::Utils::Configure::fieldmapper();' -- --osrf-config $c > "$OUTFILE"
 cp "$OUTFILE" "$FMDOJODIR/"
 echo " -> $OUTFILE"
 OUTFILES="$OUTFILE"
 
 OUTFILE="$JSDIR/fmcore.js"
 echo "Updating web_fieldmapper";
-perl -MOpenILS::Utils::Configure -e 'print OpenILS::Utils::Configure::fieldmapper("web_core");' > "$OUTFILE"
+perl -MOpenILS::Utils::Configure -e 'print OpenILS::Utils::Configure::fieldmapper("web_core");' -- --osrf-config $c > "$OUTFILE"
 echo " -> $OUTFILE"
 OUTFILES="$OUTFILES $OUTFILE"
 
@@ -99,26 +99,26 @@ OUTFILES="$OUTFILES $OUTFILE"
 
 OUTFILE="$SLIMPACDIR/*/lib_list.inc"
 echo "Updating OrgTree HTML";
-perl -MOpenILS::Utils::Configure -e "OpenILS::Utils::Configure::org_tree_html_options('$SLIMPACDIR', 'lib_list.inc');"
+perl -MOpenILS::Utils::Configure -e "OpenILS::Utils::Configure::org_tree_html_options('$SLIMPACDIR', 'lib_list.inc');" -- --osrf-config $c 
 echo " -> $OUTFILE"
 OUTFILES="$OUTFILES $OUTFILE"
 
 OUTFILE="$SLIMPACDIR/locales.inc"
 echo "Updating locales selection HTML";
-perl -MOpenILS::Utils::Configure -e "print OpenILS::Utils::Configure::locale_html_options();" > "$OUTFILE"
+perl -MOpenILS::Utils::Configure -e "print OpenILS::Utils::Configure::locale_html_options();" -- --osrf-config $c > "$OUTFILE"
 echo " -> $OUTFILE"
 OUTFILES="$OUTFILES $OUTFILE"
 
 OUTFILE="$JSDIR/OrgLasso.js"
 echo "Updating Search Groups";
-perl -MOpenILS::Utils::Configure -e "print OpenILS::Utils::Configure::org_lasso();" > "$OUTFILE";
+perl -MOpenILS::Utils::Configure -e "print OpenILS::Utils::Configure::org_lasso();" -- --osrf-config $c > "$OUTFILE";
 cp "$OUTFILE" "$FMDOJODIR/"
 echo " -> $OUTFILE"
 OUTFILES="$OUTFILES $OUTFILE"
 
 OUTFILE="$JSDIR/*/FacetDefs.js"
 echo "Updating Facet Definitions";
-perl -MOpenILS::Utils::Configure -e "OpenILS::Utils::Configure::facet_types('$JSDIR', 'FacetDefs.js');"
+perl -MOpenILS::Utils::Configure -e "OpenILS::Utils::Configure::facet_types('$JSDIR', 'FacetDefs.js');" -- --osrf-config $c 
 cp "$JSDIR/en-US/FacetDefs.js" "$FMDOJODIR/"
 echo " -> $OUTFILE"
 OUTFILES="$OUTFILES $OUTFILE"
@@ -126,7 +126,7 @@ OUTFILES="$OUTFILES $OUTFILE"
 if [ ! -z "$PROXIMITY" ]
 then
        echo "Refreshing proximity of org units";
-       perl -MOpenILS::Utils::Configure -e "OpenILS::Utils::Configure::org_tree_proximity();"
+       perl -MOpenILS::Utils::Configure -e "OpenILS::Utils::Configure::org_tree_proximity();" -- --osrf-config $c 
 fi
 
 echo "Creating combined JS..."