[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. b8ebe0a1702bcc7e07ece652caa70d694f98436a

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_12 has been updated
       via  b8ebe0a1702bcc7e07ece652caa70d694f98436a (commit)
      from  25f654231e0e520e68e137b859bc8470afd79396 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b8ebe0a1702bcc7e07ece652caa70d694f98436a
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date:   Fri May 26 10:05:02 2017 -0700

    LP#1693851: Fix hardcoded paths in srfsh support scripts
    
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    
    Conflicts:
    	Open-ILS/src/support-scripts/purge_at_events.srfsh

diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index 09a6439..9fa250c 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -274,6 +274,9 @@ ilscore-install:
 	sed -i 's|SYSCONFDIR|@sysconfdir@|g' '$(DESTDIR)@bindir@/long-overdue-status-update.pl'
 	sed -i 's|BINDIR|@bindir@|g' '$(DESTDIR)@bindir@/thaw_expired_frozen_holds.srfsh'
 	sed -i 's|BINDIR|@bindir@|g' '$(DESTDIR)@bindir@/clear_cc_number.srfsh'
+	sed -i 's|BINDIR|@bindir@|g' '$(DESTDIR)@bindir@/purge_circulations.srfsh'
+	sed -i 's|BINDIR|@bindir@|g' '$(DESTDIR)@bindir@/purge_holds.srfsh'
+	sed -i 's|BINDIR|@bindir@|g' '$(DESTDIR)@bindir@/purge_pending_users.srfsh'
 	sed -i 's|LOCALSTATEDIR|@localstatedir@|g' '$(DESTDIR)@bindir@/oils_ctl.sh'
 	sed -i 's|SYSCONFDIR|@sysconfdir@|g' '$(DESTDIR)@bindir@/oils_ctl.sh'
 
diff --git a/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh b/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh
index 084d1da..c53887b 100755
--- a/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh
+++ b/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh
@@ -1,4 +1,4 @@
-#!/openils/bin/srfsh
+#!BINDIR/srfsh
 open open-ils.cstore
 request open-ils.cstore open-ils.cstore.transaction.begin
 request open-ils.cstore open-ils.cstore.json_query {"from":["container.clear_all_expired_circ_history_items"]}
diff --git a/Open-ILS/src/support-scripts/purge_circulations.srfsh b/Open-ILS/src/support-scripts/purge_circulations.srfsh
index f1caf76..533403c 100755
--- a/Open-ILS/src/support-scripts/purge_circulations.srfsh
+++ b/Open-ILS/src/support-scripts/purge_circulations.srfsh
@@ -1,4 +1,4 @@
-#!/openils/bin/srfsh
+#!BINDIR/srfsh
 open open-ils.cstore
 request open-ils.cstore open-ils.cstore.transaction.begin
 request open-ils.cstore open-ils.cstore.json_query {"from":["action.purge_circulations"]}
diff --git a/Open-ILS/src/support-scripts/purge_holds.srfsh b/Open-ILS/src/support-scripts/purge_holds.srfsh
index bce78e2..3db90e1 100755
--- a/Open-ILS/src/support-scripts/purge_holds.srfsh
+++ b/Open-ILS/src/support-scripts/purge_holds.srfsh
@@ -1,4 +1,4 @@
-#!/openils/bin/srfsh
+#!BINDIR/srfsh
 open open-ils.cstore
 request open-ils.cstore open-ils.cstore.transaction.begin
 request open-ils.cstore open-ils.cstore.json_query {"from":["action.purge_holds"]}
diff --git a/Open-ILS/src/support-scripts/purge_pending_users.srfsh b/Open-ILS/src/support-scripts/purge_pending_users.srfsh
index 56d337a..b7ae7f6 100755
--- a/Open-ILS/src/support-scripts/purge_pending_users.srfsh
+++ b/Open-ILS/src/support-scripts/purge_pending_users.srfsh
@@ -1,4 +1,4 @@
-#!/openils/bin/srfsh
+#!BINDIR/srfsh
 open open-ils.cstore
 request open-ils.cstore open-ils.cstore.transaction.begin
 request open-ils.cstore open-ils.cstore.json_query {"from":["staging.purge_pending_users"]}
diff --git a/Open-ILS/src/support-scripts/update_hard_due_dates.srfsh b/Open-ILS/src/support-scripts/update_hard_due_dates.srfsh
index f14a24c..8f86c02 100755
--- a/Open-ILS/src/support-scripts/update_hard_due_dates.srfsh
+++ b/Open-ILS/src/support-scripts/update_hard_due_dates.srfsh
@@ -1,4 +1,4 @@
-#!/openils/bin/srfsh
+#!BINDIR/srfsh
 open open-ils.cstore
 request open-ils.cstore open-ils.cstore.transaction.begin
 request open-ils.cstore open-ils.cstore.json_query {"from":["config.update_hard_due_dates"]}

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/Makefile.am                           |    3 +++
 .../clear_expired_circ_history.srfsh               |    2 +-
 .../src/support-scripts/purge_circulations.srfsh   |    2 +-
 Open-ILS/src/support-scripts/purge_holds.srfsh     |    2 +-
 .../src/support-scripts/purge_pending_users.srfsh  |    2 +-
 .../support-scripts/update_hard_due_dates.srfsh    |    2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS