From 98fc4aff6296411de4f1365ef21ea44d635ccf62 Mon Sep 17 00:00:00 2001
From: Jeff Davis <jdavis@sitka.bclibraries.ca>
Date: Fri, 26 May 2017 10:05:02 -0700
Subject: [PATCH] LP#1693851: Fix hardcoded paths in srfsh support scripts

Signed-off-by: Jeff Davis <jdavis@sitka.bclibraries.ca>
Signed-off-by: Josh Stompro <stomproj@larl.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 Open-ILS/src/Makefile.am                                      | 4 ++++
 Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh | 2 +-
 Open-ILS/src/support-scripts/purge_at_events.srfsh            | 2 +-
 Open-ILS/src/support-scripts/purge_circulations.srfsh         | 2 +-
 Open-ILS/src/support-scripts/purge_holds.srfsh                | 2 +-
 Open-ILS/src/support-scripts/purge_pending_users.srfsh        | 2 +-
 Open-ILS/src/support-scripts/update_hard_due_dates.srfsh      | 2 +-
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index 253e8ab840..21508e898e 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -275,6 +275,10 @@ 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_at_events.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 084d1dae6e..c53887b693 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_at_events.srfsh b/Open-ILS/src/support-scripts/purge_at_events.srfsh
index f14b287658..9cad283379 100755
--- a/Open-ILS/src/support-scripts/purge_at_events.srfsh
+++ b/Open-ILS/src/support-scripts/purge_at_events.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_trigger.purge_events"]}
diff --git a/Open-ILS/src/support-scripts/purge_circulations.srfsh b/Open-ILS/src/support-scripts/purge_circulations.srfsh
index f1caf76bcc..533403c61a 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 bce78e255e..3db90e133d 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 56d337aba4..b7ae7f6575 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 f14a24ce53..8f86c02c30 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"]}
-- 
2.11.0