Browse Source

Fix for GitHub issue #40: updates.d not being cleared.

Adam Ierymenko 11 years ago
parent
commit
268ec8d1e0
2 changed files with 2 additions and 1 deletions
  1. 1 0
      make-linux.mk
  2. 1 1
      node/SoftwareUpdater.cpp

+ 1 - 0
make-linux.mk

@@ -8,6 +8,7 @@ LIBS=
 
 
 ifeq ($(ZT_OFFICIAL_RELEASE),1)
 ifeq ($(ZT_OFFICIAL_RELEASE),1)
 	ZT_AUTO_UPDATE=1
 	ZT_AUTO_UPDATE=1
+	DEFS+=-DZT_OFFICIAL_RELEASE 
 endif
 endif
 ifeq ($(ZT_AUTO_UPDATE),1)
 ifeq ($(ZT_AUTO_UPDATE),1)
 	DEFS+=-DZT_AUTO_UPDATE 
 	DEFS+=-DZT_AUTO_UPDATE 

+ 1 - 1
node/SoftwareUpdater.cpp

@@ -81,7 +81,7 @@ void SoftwareUpdater::cleanOldUpdates()
 	std::map<std::string,bool> dl(Utils::listDirectory(updatesDir.c_str()));
 	std::map<std::string,bool> dl(Utils::listDirectory(updatesDir.c_str()));
 	for(std::map<std::string,bool>::iterator i(dl.begin());i!=dl.end();++i) {
 	for(std::map<std::string,bool>::iterator i(dl.begin());i!=dl.end();++i) {
 		if (!i->second)
 		if (!i->second)
-			Utils::rm(i->first.c_str());
+			Utils::rm((updatesDir + ZT_PATH_SEPARATOR_S + i->first).c_str());
 	}
 	}
 }
 }