From 29df0d288a04e17c51ccf7be3a636d021f08cda6 Mon Sep 17 00:00:00 2001
From: Scot Kronenfeld <kronenfe@cs.wisc.edu>
Date: Fri, 13 Jan 2012 17:26:49 +0000
Subject: [PATCH] Making condor-cron work with a Condor installed in a
 non-standard location. Instead of calling /usr/bin/condor_CMD from the
 wrappers, just assume that the necessary command is in the PATH (and we'll
 take care of setting the PATH in condor-cron.sh)

git-svn-id: https://vdt.cs.wisc.edu/svn/software/condor-cron/trunk@13931 4e558342-562e-0410-864c-e07659590f8c
---
 wrappers/condor_cron_config_val | 2 +-
 wrappers/condor_cron_history    | 2 +-
 wrappers/condor_cron_hold       | 2 +-
 wrappers/condor_cron_q          | 2 +-
 wrappers/condor_cron_qedit      | 2 +-
 wrappers/condor_cron_release    | 2 +-
 wrappers/condor_cron_rm         | 2 +-
 wrappers/condor_cron_submit     | 2 +-
 wrappers/condor_cron_version    | 2 +-
 wrappers/make-wrappers.pl       | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/wrappers/condor_cron_config_val b/wrappers/condor_cron_config_val
index 5962460..cc58fe4 100755
--- a/wrappers/condor_cron_config_val
+++ b/wrappers/condor_cron_config_val
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 . /usr/libexec/condor-cron/condor-cron.sh
-exec /usr/bin/condor_config_val "$@"
+exec condor_config_val "$@"
diff --git a/wrappers/condor_cron_history b/wrappers/condor_cron_history
index 9e6aa2b..dcd2fdc 100755
--- a/wrappers/condor_cron_history
+++ b/wrappers/condor_cron_history
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 . /usr/libexec/condor-cron/condor-cron.sh
-exec /usr/bin/condor_history "$@"
+exec condor_history "$@"
diff --git a/wrappers/condor_cron_hold b/wrappers/condor_cron_hold
index d6e9d7b..79ba661 100755
--- a/wrappers/condor_cron_hold
+++ b/wrappers/condor_cron_hold
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 . /usr/libexec/condor-cron/condor-cron.sh
-exec /usr/bin/condor_hold "$@"
+exec condor_hold "$@"
diff --git a/wrappers/condor_cron_q b/wrappers/condor_cron_q
index 1d45656..94d87ca 100755
--- a/wrappers/condor_cron_q
+++ b/wrappers/condor_cron_q
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 . /usr/libexec/condor-cron/condor-cron.sh
-exec /usr/bin/condor_q "$@"
+exec condor_q "$@"
diff --git a/wrappers/condor_cron_qedit b/wrappers/condor_cron_qedit
index b20f0f4..4e8c2a9 100755
--- a/wrappers/condor_cron_qedit
+++ b/wrappers/condor_cron_qedit
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 . /usr/libexec/condor-cron/condor-cron.sh
-exec /usr/bin/condor_qedit "$@"
+exec condor_qedit "$@"
diff --git a/wrappers/condor_cron_release b/wrappers/condor_cron_release
index de0747d..8471b30 100755
--- a/wrappers/condor_cron_release
+++ b/wrappers/condor_cron_release
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 . /usr/libexec/condor-cron/condor-cron.sh
-exec /usr/bin/condor_release "$@"
+exec condor_release "$@"
diff --git a/wrappers/condor_cron_rm b/wrappers/condor_cron_rm
index b9caae9..b65d8ff 100755
--- a/wrappers/condor_cron_rm
+++ b/wrappers/condor_cron_rm
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 . /usr/libexec/condor-cron/condor-cron.sh
-exec /usr/bin/condor_rm "$@"
+exec condor_rm "$@"
diff --git a/wrappers/condor_cron_submit b/wrappers/condor_cron_submit
index 886497b..8445776 100755
--- a/wrappers/condor_cron_submit
+++ b/wrappers/condor_cron_submit
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 . /usr/libexec/condor-cron/condor-cron.sh
-exec /usr/bin/condor_submit "$@"
+exec condor_submit "$@"
diff --git a/wrappers/condor_cron_version b/wrappers/condor_cron_version
index 54a8555..8727eca 100755
--- a/wrappers/condor_cron_version
+++ b/wrappers/condor_cron_version
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 . /usr/libexec/condor-cron/condor-cron.sh
-exec /usr/bin/condor_version "$@"
+exec condor_version "$@"
diff --git a/wrappers/make-wrappers.pl b/wrappers/make-wrappers.pl
index bf70007..73fb5fe 100755
--- a/wrappers/make-wrappers.pl
+++ b/wrappers/make-wrappers.pl
@@ -28,7 +28,7 @@
     print OUT "#!/bin/sh\n";
     print OUT "\n";
     print OUT ". /usr/libexec/condor-cron/condor-cron.sh\n";
-    print OUT "exec /usr/bin/$cmd \"\$\@\"\n";
+    print OUT "exec $cmd \"\$\@\"\n";
 
     close(OUT);