From: Art Cancro <ajc@citadel.org>
Date: Sun, 16 Jul 2017 02:51:15 +0000 (-0400)
Subject: Remove code which creates or references the 'bitbucket' directory.  We haven't used... 
X-Git-Tag: v939~528
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=9afd9114bb74ee65c505c1133cd6c5c5bb90c7de

Remove code which creates or references the 'bitbucket' directory.  We haven't used that in ages.
---

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 0c7857a84..6f8a27d6f 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -253,7 +253,7 @@ install-data-new:
 		echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
 		$(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
 	fi
-	@for i in bio bitbucket files images info userpics netconfigs; do \
+	@for i in bio files images info userpics; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
 	done
 
@@ -293,7 +293,7 @@ install-doc-new:
 	$(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt
 
 install-exec: all
-	@for i in bio bitbucket files images info userpics netconfigs; do \
+	@for i in bio files images info userpics; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
 	@for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
diff --git a/citadel/debian/citadel-server.dirs b/citadel/debian/citadel-server.dirs
index 065b8b1d4..a4a804495 100644
--- a/citadel/debian/citadel-server.dirs
+++ b/citadel/debian/citadel-server.dirs
@@ -1,6 +1,5 @@
 usr/share/citadel-server/help
 var/lib/citadel/bio
-var/lib/citadel/bitbucket
 var/lib/citadel/data
 var/lib/citadel/files
 var/lib/citadel/images
diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h
index a7fddb9d5..e417ed35b 100644
--- a/citadel/include/citadel_dirs.h
+++ b/citadel/include/citadel_dirs.h
@@ -9,7 +9,6 @@ extern char ctdl_home_directory[PATH_MAX];
 
 /* all our directories */
 extern char ctdl_bio_dir[PATH_MAX];
-extern char ctdl_bb_dir[PATH_MAX];
 extern char ctdl_data_dir[PATH_MAX];
 extern char ctdl_dspam_dir[PATH_MAX];
 extern char ctdl_file_dir[PATH_MAX];
diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index 7a4c70534..daacbe3d7 100644
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -1,7 +1,7 @@
 /*
  * citadel_dirs.c : calculate pathnames for various files used in the Citadel system
  *
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
  *
  *  This program is open source software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 3.
@@ -27,7 +27,6 @@
 /* our directories... */
 char ctdl_home_directory[PATH_MAX] = "";
 char ctdl_bio_dir[PATH_MAX]="bio";
-char ctdl_bb_dir[PATH_MAX]="bitbucket";
 char ctdl_data_dir[PATH_MAX]="data";
 char ctdl_dspam_dir[PATH_MAX]="dspam";
 char ctdl_file_dir[PATH_MAX]="files";
@@ -159,7 +158,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	basedir=DATA_DIR;
 #endif
 	COMPUTE_DIRECTORY(ctdl_bio_dir);
-	COMPUTE_DIRECTORY(ctdl_bb_dir);
 	COMPUTE_DIRECTORY(ctdl_data_dir);
 	COMPUTE_DIRECTORY(ctdl_dspam_dir);
 	COMPUTE_DIRECTORY(ctdl_file_dir);
@@ -169,7 +167,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	COMPUTE_DIRECTORY(ctdl_bbsbase_dir);
 
 	StripSlashes(ctdl_bio_dir, 1);
-	StripSlashes(ctdl_bb_dir, 1);
 	StripSlashes(ctdl_data_dir, 1);
 	StripSlashes(ctdl_dspam_dir, 1);
 	StripSlashes(ctdl_file_dir, 1);
@@ -309,7 +306,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	StripSlashes(file_funambol_msg, 0);
 
 	DBG_PRINT(ctdl_bio_dir);
-	DBG_PRINT(ctdl_bb_dir);
 	DBG_PRINT(ctdl_data_dir);
 	DBG_PRINT(ctdl_dspam_dir);
 	DBG_PRINT(ctdl_file_dir);
@@ -430,7 +426,6 @@ int create_run_directories(long UID, long GID)
 {
 	int rv = 0;
 	rv += create_dir(ctdl_message_dir   , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
-	rv += create_dir(ctdl_bb_dir        , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
 	rv += create_dir(ctdl_file_dir      , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
 	rv += create_dir(ctdl_spool_dir     , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
 	rv += create_dir(ctdl_netout_dir    , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);