From: Art Cancro <ajc@citadel.org>
Date: Sun, 8 Aug 2021 19:32:40 +0000 (-0400)
Subject: Remove APPDIR support in database_cleanup.sh
X-Git-Tag: v939~28
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=e74296dcc0179b87f560b6957320b495e19148c0;p=citadel.git

Remove APPDIR support in database_cleanup.sh
---

diff --git a/citadel/database_cleanup.sh b/citadel/database_cleanup.sh
index 2c8f5804c..38b1fa307 100755
--- a/citadel/database_cleanup.sh
+++ b/citadel/database_cleanup.sh
@@ -38,15 +38,8 @@ done
 
 DATA_DIR=$DATA_DIR/data
 
-# If we're on an AppDir system, use the embedded db_tools.
-if [ "${APPDIR}" != "" ] ; then
-	export PATH=${APPDIR}/usr/bin:$PATH
-	RECOVER=${APPDIR}/usr/bin/db_recover
-	DUMP=${APPDIR}/usr/bin/db_dump
-	LOAD=${APPDIR}/usr/bin/db_load
-
-# If we're on an Easy Install system, use our own db_ tools.
-elif [ -x /usr/local/ctdlsupport/bin/db_dump ] ; then
+# If we're on a Docker or Easy Install system, use our own db_ tools.
+if [ -x /usr/local/ctdlsupport/bin/db_dump ] ; then
 	export PATH=/usr/local/ctdlsupport/bin:$PATH
 	RECOVER=/usr/local/ctdlsupport/bin/db_recover
 	DUMP=/usr/local/ctdlsupport/bin/db_dump