Searching for functions.rc on the new place

diff --git a/scripts/check-ldap-passwd b/scripts/check-ldap-passwd
index cc4d9f5e5e46b83d7fa0f1c913e157d8a633b17b..b4633ade6a82dbe2f9c020be4c773b3768626e30 100755 (executable)
--- a/scripts/check-ldap-passwd
+++ b/scripts/check-ldap-passwd
@@ -10,10 +10,10 @@ BASE_DIR=$( dirname "${BIN_DIR}" )
 LIB_DIR="${BASE_DIR}/lib"
 CONF_DIR="${BASE_DIR}/etc"
 
-if [[ -f "${LIB_DIR}/functions.rc" ]] ; then
-    . "${LIB_DIR}/functions.rc"
+if [[ -f "${BIN_DIR}/functions.rc" ]] ; then
+    . "${BIN_DIR}/functions.rc"
 else
-    echo "Bash resource file '${LIB_DIR}/functions.rc' not found" >&2
+    echo "Bash resource file '${BIN_DIR}/functions.rc' not found" >&2
     exit 5
 fi
 
@@ -25,7 +25,7 @@ detect_color
 DESCRIPTION=$( cat <<-EOF
        Checks the given password of the given user against the password in LDAP.
 
-EOF
+       EOF
 )
 
 #------------------------------------------------------------------------------

diff --git a/scripts/get-dns-zonefiles b/scripts/get-dns-zonefiles
index 8ca38e21d80c6087b41f252bc78ca30377320a21..cf0bb2424851e40827be6e368e132e8eb0ab2d96 100755 (executable)
--- a/scripts/get-dns-zonefiles
+++ b/scripts/get-dns-zonefiles
@@ -10,10 +10,10 @@ BASE_DIR=$( dirname "${BIN_DIR}" )
 LIB_DIR="${BASE_DIR}/lib"
 CONF_DIR="${BASE_DIR}/etc"
 
-if [[ -f "${LIB_DIR}/functions.rc" ]] ; then
-    . "${LIB_DIR}/functions.rc"
+if [[ -f "${BIN_DIR}/functions.rc" ]] ; then
+    . "${BIN_DIR}/functions.rc"
 else
-    echo "Bash resource file '${LIB_DIR}/functions.rc' not found" >&2
+    echo "Bash resource file '${BIN_DIR}/functions.rc' not found" >&2
     exit 5
 fi
 

diff --git a/scripts/get-ldap-dn b/scripts/get-ldap-dn
index 5e9cbccedd9295faf53c211d169b5148aa8029f2..fd33120cdfa04cddc8ef7043cafb5402b0728f19 100755 (executable)
--- a/scripts/get-ldap-dn
+++ b/scripts/get-ldap-dn
@@ -10,10 +10,10 @@ BASE_DIR=$( dirname "${BIN_DIR}" )
 LIB_DIR="${BASE_DIR}/lib"
 CONF_DIR="${BASE_DIR}/etc"
 
-if [[ -f "${LIB_DIR}/functions.rc" ]] ; then
-    . "${LIB_DIR}/functions.rc"
+if [[ -f "${BIN_DIR}/functions.rc" ]] ; then
+    . "${BIN_DIR}/functions.rc"
 else
-    echo "Bash resource file '${LIB_DIR}/functions.rc' not found" >&2
+    echo "Bash resource file '${BIN_DIR}/functions.rc' not found" >&2
     exit 5
 fi
 

diff --git a/scripts/get-ldap-info b/scripts/get-ldap-info
index 73dd0802d5696e4d9866cb6afca0ce8d50b8a763..33baf6d86706144eb9ed621e62294cfb0b734a07 100755 (executable)
--- a/scripts/get-ldap-info
+++ b/scripts/get-ldap-info
@@ -10,10 +10,10 @@ BASE_DIR=$( dirname "${BIN_DIR}" )
 LIB_DIR="${BASE_DIR}/lib"
 CONF_DIR="${BASE_DIR}/etc"
 
-if [[ -f "${LIB_DIR}/functions.rc" ]] ; then
-    . "${LIB_DIR}/functions.rc"
+if [[ -f "${BIN_DIR}/functions.rc" ]] ; then
+    . "${BIN_DIR}/functions.rc"
 else
-    echo "Bash resource file '${LIB_DIR}/functions.rc' not found" >&2
+    echo "Bash resource file '${BIN_DIR}/functions.rc' not found" >&2
     exit 5
 fi
 

diff --git a/scripts/get-ldap-mail b/scripts/get-ldap-mail
index ae530a23f448314c35e82a6a7e7b05778659a4e6..e9fcdfcb60538a5519d057f823812573c933828f 100755 (executable)
--- a/scripts/get-ldap-mail
+++ b/scripts/get-ldap-mail
@@ -10,10 +10,10 @@ BASE_DIR=$( dirname "${BIN_DIR}" )
 LIB_DIR="${BASE_DIR}/lib"
 CONF_DIR="${BASE_DIR}/etc"
 
-if [[ -f "${LIB_DIR}/functions.rc" ]] ; then
-    . "${LIB_DIR}/functions.rc"
+if [[ -f "${BIN_DIR}/functions.rc" ]] ; then
+    . "${BIN_DIR}/functions.rc"
 else
-    echo "Bash resource file '${LIB_DIR}/functions.rc' not found" >&2
+    echo "Bash resource file '${BIN_DIR}/functions.rc' not found" >&2
     exit 5
 fi
 

diff --git a/scripts/get-ldap-membership b/scripts/get-ldap-membership
index 8e687227da1df56ba8ec208b37d3c88c6130ff49..cf1bb329c7bb2bfc2169beb79b7c6669fb004905 100755 (executable)
--- a/scripts/get-ldap-membership
+++ b/scripts/get-ldap-membership
@@ -10,10 +10,10 @@ BASE_DIR=$( dirname "${BIN_DIR}" )
 LIB_DIR="${BASE_DIR}/lib"
 CONF_DIR="${BASE_DIR}/etc"
 
-if [[ -f "${LIB_DIR}/functions.rc" ]] ; then
-    . "${LIB_DIR}/functions.rc"
+if [[ -f "${BIN_DIR}/functions.rc" ]] ; then
+    . "${BIN_DIR}/functions.rc"
 else
-    echo "Bash resource file '${LIB_DIR}/functions.rc' not found" >&2
+    echo "Bash resource file '${BIN_DIR}/functions.rc' not found" >&2
     exit 5
 fi
 

diff --git a/scripts/nfs-clean-homedirs b/scripts/nfs-clean-homedirs
index a5c0425cb968f137f0197bbd063e66c22cb92141..270879e4d003ba3ac157077aae889e5038efbdb7 100755 (executable)
--- a/scripts/nfs-clean-homedirs
+++ b/scripts/nfs-clean-homedirs
@@ -119,10 +119,10 @@ pts.user
 COO
 Investorrelations"
 
-if [[ -f "${LIB_DIR}/functions.rc" ]] ; then
-    . "${LIB_DIR}/functions.rc"
+if [[ -f "${BIN_DIR}/functions.rc" ]] ; then
+    . "${BIN_DIR}/functions.rc"
 else
-    echo "Bash resource file '${LIB_DIR}/functions.rc' not found" >&2
+    echo "Bash resource file '${BIN_DIR}/functions.rc' not found" >&2
     exit 5
 fi