From 89614b347d070ebca99c71e613532371f7877234 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Tue, 30 Mar 2021 14:54:26 -0400
Subject: [PATCH] updated database_cleanup.sh

---
 citadel/.gitignore                                |  1 -
 citadel/Makefile.in                               |  2 +-
 citadel/configure.ac                              |  2 +-
 ...database_cleanup.sh.in => database_cleanup.sh} | 15 +++++++++------
 4 files changed, 11 insertions(+), 9 deletions(-)
 rename citadel/{database_cleanup.sh.in => database_cleanup.sh} (92%)

diff --git a/citadel/.gitignore b/citadel/.gitignore
index 81bb5c37a..7f78ac606 100644
--- a/citadel/.gitignore
+++ b/citadel/.gitignore
@@ -22,7 +22,6 @@ config.status
 configure
 configure-stamp
 ctdlmigrate
-database_cleanup.sh
 getmail
 modules_init.c
 modules_init.h
diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 1a492321f..bf475dabd 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -300,7 +300,7 @@ clean:
 	rm -vf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
 
 cleaner: clean
-	rm -vrf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) database_cleanup.sh *.la
+	rm -vrf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) *.la
 	rm -vrf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources
 
 distclean: cleaner
diff --git a/citadel/configure.ac b/citadel/configure.ac
index 1c7d7ae58..8320a9dbf 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -918,7 +918,7 @@ AC_SUBST(SETUP_LIBS)
 AC_SUBST(DIFF)
 AC_SUBST(PATCH)
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT(database_cleanup.sh po/citadel-setup/Makefile)
+AC_OUTPUT(po/citadel-setup/Makefile)
 
 if test -z "$DATABASE"; then
 	AC_MSG_WARN([No database driver was found. Please install Berkeley DB.])
diff --git a/citadel/database_cleanup.sh.in b/citadel/database_cleanup.sh
similarity index 92%
rename from citadel/database_cleanup.sh.in
rename to citadel/database_cleanup.sh
index e2815497d..c35527497 100755
--- a/citadel/database_cleanup.sh.in
+++ b/citadel/database_cleanup.sh
@@ -7,8 +7,6 @@ die () {
 
 DATA_DIR="/usr/local/citadel"
 
-
-
 usage() {
 	echo "Usage: database_cleanup.sh [ -h citadel_dir ]"
 	exit 2
@@ -40,16 +38,22 @@ 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.
-#
-if [ -x /usr/local/ctdlsupport/bin/db_dump ] ; then
+elif [ -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
 	LOAD=/usr/local/ctdlsupport/bin/db_load
 
+# usual install
 else
-	# ok usual install?
 	if test -f /usr/bin/db_dump; then 
 		RECOVER=/usr/bin/db_recover
 		DUMP=/usr/bin/db_dump
@@ -77,7 +81,6 @@ else
 fi
 
 # Ok, let's begin.
-#
 
 clear
 cat <<!
-- 
2.30.2