Răsfoiți Sursa

Software update fetcher seems to work, going back to updater/installer itself.

Adam Ierymenko 11 ani în urmă
părinte
comite
ec4ffc0c2c
3 a modificat fișierele cu 11 adăugiri și 1 ștergeri
  1. 4 0
      make-linux.mk
  2. 5 1
      make-mac.mk
  3. 2 0
      node/SoftwareUpdater.cpp

+ 4 - 0
make-linux.mk

@@ -5,6 +5,10 @@ INCLUDES=
 DEFS=
 LIBS=
 
+ifeq ($(ZT_AUTO_UPDATE),1)
+	DEFS+=-DZT_AUTO_UPDATE
+endif
+
 # Uncomment for a release optimized build
 CFLAGS=-Wall -O3 -fno-unroll-loops -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS)
 STRIP=strip --strip-all

+ 5 - 1
make-mac.mk

@@ -2,9 +2,13 @@ CC=clang
 CXX=clang++
 
 INCLUDES=
-DEFS=-DZT_AUTO_UPDATE
+DEFS=
 LIBS=-lm
 
+ifeq ($(ZT_AUTO_UPDATE),1)
+	DEFS+=-DZT_AUTO_UPDATE
+endif
+
 # Uncomment for a release optimized universal binary build
 CFLAGS=-arch i386 -arch x86_64 -Wall -O4 -pthread -mmacosx-version-min=10.6 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
 STRIP=strip

+ 2 - 0
node/SoftwareUpdater.cpp

@@ -176,6 +176,8 @@ void SoftwareUpdater::_cbHandleGetLatestVersionBinary(void *arg,int code,const s
 	::close(fd);
 	::chmod(updatePath.c_str(),0755);
 
+	upd->_status = UPDATE_STATUS_IDLE;
+
 	_r->node->terminate(Node::NODE_RESTART_FOR_UPGRADE,updatePath.c_str());
 #endif