mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

update: allow to flash zipped archives

Browse Source 
Origin commit data
------------------
Commit: 47d263e419
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-05-28 (Tue, 28 May 2019)

Origin message was:
------------------
- update: allow to flash zipped archives
This commit is contained in:
vanhofen
2019-05-28 20:56:00 +02:00
parent 9ef57196ee
commit 899b31f4f0
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/update.cpp
View File

@@ -363,9 +363,9 @@ bool CFlashUpdate::selectHttpImage(void)
}
#endif
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (gotImage && (filename.substr(filename.find_last_of(".") + 1) == "tgz"))
if (gotImage && (filename.substr(filename.find_last_of(".") + 1) == "tgz" || filename.substr(filename.find_last_of(".") + 1) == "zip"))
{
// manipulate fileType for tgz-packages
// manipulate fileType for tgz- or zip-packages
fileType = 'Z';
}
#endif
@@ -442,7 +442,12 @@ bool CFlashUpdate::checkVersion4Update()
CFileFilter UpdatesFilter;
if (allow_flash)
{
UpdatesFilter.addFilter(FILEBROWSER_UPDATE_FILTER);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
UpdatesFilter.addFilter("zip");
#endif
}
std::string filters[] = {"bin", "txt", "opk", "ipk"};
for(size_t i=0; i<sizeof(filters)/sizeof(filters[0]) ;i++)
@@ -500,6 +505,8 @@ bool CFlashUpdate::checkVersion4Update()
fileType = 'T';
else if(!strcmp(ptr, "tgz"))
fileType = 'Z';
else if(!strcmp(ptr, "zip"))
fileType = 'Z';
else if(!allow_flash)
return false;
else
@@ -734,18 +741,18 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_START_OFGWRITE);
hide();
const char ofgwrite_tgz[] = "/bin/ofgwrite_tgz";
dprintf(DEBUG_NORMAL, "[update] calling %s %s %s %s\n", ofgwrite_tgz, g_settings.update_dir.c_str(), filename.c_str(), ofgwrite_options.c_str());
const char ofgwrite_caller[] = "/bin/ofgwrite_caller";
dprintf(DEBUG_NORMAL, "[update] calling %s %s %s %s\n", ofgwrite_caller, g_settings.update_dir.c_str(), filename.c_str(), ofgwrite_options.c_str());
#ifndef DRYRUN
if (flashing)
my_system(4, ofgwrite_tgz, g_settings.update_dir.c_str(), filename.c_str(), ofgwrite_options.c_str());
my_system(4, ofgwrite_caller, g_settings.update_dir.c_str(), filename.c_str(), ofgwrite_options.c_str());
/*
TODO: fix osd-flickering
Neutrino is clearing framebuffer, so ofgwrite's gui is cleared too.
*/
dprintf(DEBUG_NORMAL, "[update] %s done\n", ofgwrite_tgz);
dprintf(DEBUG_NORMAL, "[update] %s done\n", ofgwrite_caller);
if (restart == CMsgBox::mbrYes)
CNeutrinoApp::getInstance()->exec(NULL, "reboot");