Merge branch 'master' into testing
This commit is contained in:
10
Process.cpp
10
Process.cpp
@ -198,6 +198,12 @@ char *g_files[] = {
|
||||
};
|
||||
|
||||
|
||||
///////
|
||||
//
|
||||
// used to make package to install files for the package.
|
||||
// so do not include hosts.conf or gb.conf
|
||||
//
|
||||
///////
|
||||
bool Process::getFilesToCopy ( char *srcDir , SafeBuf *buf ) {
|
||||
|
||||
// sanirty
|
||||
@ -217,10 +223,6 @@ bool Process::getFilesToCopy ( char *srcDir , SafeBuf *buf ) {
|
||||
, g_files[i] );
|
||||
}
|
||||
|
||||
// these are no longer required since we generate them
|
||||
buf->safePrintf(" %shosts.conf",srcDir);
|
||||
buf->safePrintf(" %sgb.conf",srcDir);
|
||||
|
||||
// and the required runtime subdirs
|
||||
buf->safePrintf(" %santiword-dir",srcDir);
|
||||
buf->safePrintf(" %sucdata",srcDir);
|
||||
|
8
main.cpp
8
main.cpp
@ -4654,6 +4654,9 @@ int install ( install_flag_konst_t installFlag , long hostId , char *dir ,
|
||||
//fileListBuf.safePrintf(" %shosts.conf",srcDir);
|
||||
// the dmoz data dir if there
|
||||
fileListBuf.safePrintf(" %scat",srcDir);
|
||||
fileListBuf.safePrintf(" %shosts.conf",srcDir);
|
||||
fileListBuf.safePrintf(" %sgb.conf",srcDir);
|
||||
|
||||
|
||||
SafeBuf tmpBuf;
|
||||
tmpBuf.safePrintf(
|
||||
@ -17239,6 +17242,11 @@ char *getcwd2 ( char *arg2 ) {
|
||||
return "/var/gigablast/data0/";
|
||||
}
|
||||
|
||||
///////
|
||||
//
|
||||
// used to make package to install files for the package
|
||||
//
|
||||
///////
|
||||
int copyFiles ( char *dstDir ) {
|
||||
|
||||
char *srcDir = "./";
|
||||
|
Reference in New Issue
Block a user