From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 9 Dec 2021 07:25:56 +0000 (+0100)
Subject: Searching for functions.rc on the new place
X-Git-Tag: 0.4.1~4^2~48
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=fb00817cd4503b58045e53ef778dcd3da110d0f2;p=pixelpark%2Fpp-admin-tools.git

Searching for functions.rc on the new place
---

diff --git a/scripts/check-ldap-passwd b/scripts/check-ldap-passwd
index cc4d9f5..b4633ad 100755
--- 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 8ca38e2..cf0bb24 100755
--- 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 5e9cbcc..fd33120 100755
--- 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 73dd080..33baf6d 100755
--- 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 ae530a2..e9fcdfc 100755
--- 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 8e68722..cf1bb32 100755
--- 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 a5c0425..270879e 100755
--- 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