X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=changer-src%2Fchg-lib.sh.in;h=a53c48a8cfff139732818a8be0e8b8d2ccbe148c;hb=fd48f3e498442f0cbff5f3606c7c403d0566150e;hp=6a83095028865f58b16439b1bac56f0d88c5a0f0;hpb=96f35b20267e8b1a1c846d476f27fcd330e0b018;p=debian%2Famanda

diff --git a/changer-src/chg-lib.sh.in b/changer-src/chg-lib.sh.in
index 6a83095..a53c48a 100644
--- a/changer-src/chg-lib.sh.in
+++ b/changer-src/chg-lib.sh.in
@@ -28,21 +28,12 @@ amlibexecdir="@amlibexecdir@"
 # Eponymous functions to access various amanda apps
 # TODO: move to amanda-sh-lib.sh
 
-if test "@USE_VERSION_SUFFIXES@" = "yes"; then
-    amgetconf() {
-        "${sbindir}/amgetconf-@VERSION@" "${@}"
-    }
-    amdevcheck() {
-        "${sbindir}/amdevcheck-@VERSION@" "${@}"
-    }
-else
-    amgetconf() {
-        "${sbindir}/amgetconf" "${@}"
-    }
-    amdevcheck() {
-        "${sbindir}/amdevcheck" "${@}"
-    }
-fi
+amgetconf() {
+    "${sbindir}/amgetconf" "${@}"
+}
+amdevcheck() {
+    "${sbindir}/amdevcheck" "${@}"
+}
 
 # This function tries to find a useable mt binary. If a fully-qualified path
 # was provided at configure time or via a config file, we check that it
@@ -102,9 +93,7 @@ tape_device_filename() {
 #               amdevcheck, suitable for use in higher-level error messages
 amdevcheck_status() {
     amdevcheck_message=
-    local amdevcheck_config_dir=`pwd`
-    local amdevcheck_config_name=`basename $amdevcheck_config_dir`
-    local amdevcheck_output=`amdevcheck $amdevcheck_config_name $@`
+    local amdevcheck_output=`amdevcheck . $@`
     local amdevcheck_status=$?
 
     test "$amdevcheck_status" -ne 0 && return 0