devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Of course the moment you release, you spot that one bug.

Browse source 
Portable rbutil no longer tries to delete itself from the player if you decide to uninstall.  Version bumped to 0.2.1.1 to avoid confusion.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11759 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Christi Scarborough 2006-12-14 06:49:37 +00:00
parent f938d8cc34
commit 177bd8ecf4
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rbutil/credits.h
View file

@ -22,7 +22,7 @@
#define CREDITS_H_INCLUDED #define CREDITS_H_INCLUDED
#define RBUTIL_FULLNAME "The Rockbox Utility" #define RBUTIL_FULLNAME "The Rockbox Utility"
#define RBUTIL_VERSION "Version 0.2.1.0" #define RBUTIL_VERSION "Version 0.2.1.1"
static const char* rbutil_developers[] = { static const char* rbutil_developers[] = {
"Christi Alice Scarborough", "Christi Alice Scarborough",

8
rbutil/rbutil-rc.rc
View file

@ -1,8 +1,8 @@
#define RBUTIL 1 #define RBUTIL 1
#include <wx/msw/wx.rc> #include <wx/msw/wx.rc>
RBUTIL VERSIONINFO RBUTIL VERSIONINFO
FILEVERSION 0,2,1,0 FILEVERSION 0,2,1,1
PRODUCTVERSION 0,2,1,0 PRODUCTVERSION 0,2,1,1
FILEOS 0x00000004 FILEOS 0x00000004
FILETYPE 0x00000001 FILETYPE 0x00000001
BEGIN BEGIN
@ -10,8 +10,8 @@ BEGIN
BEGIN BEGIN
BLOCK "FFFF0000" BLOCK "FFFF0000"
BEGIN BEGIN
VALUE "FileVersion", "0.2.1.0\0" VALUE "FileVersion", "0.2.1.1\0"
VALUE "ProductVersion", "0.2.1.0\0" VALUE "ProductVersion", "0.2.1.1\0"
VALUE "CompanyName", "Rockbox Team\0" VALUE "CompanyName", "Rockbox Team\0"
VALUE "FileDescription", "Rockbox Utility\0" VALUE "FileDescription", "Rockbox Utility\0"
VALUE "InternalName", "rbutil\0" VALUE "InternalName", "rbutil\0"

9
rbutil/rbutil.cpp
View file

@ -432,6 +432,15 @@ int Uninstall(const wxString dir, bool isFullUninstall) {
for (i = 0; i < totalfiles; i++) for (i = 0; i < totalfiles; i++)
{ {
// If we're running on the device, let's not delete our own
// installation, eh?
if (gv->portable &&
FilesToRemove->Item(i).StartsWith(wxT(PATH_SEP
"RockboxUtility")) )
{
continue;
}
wxString* buf2 = new wxString; wxString* buf2 = new wxString;
buf.Printf("%s%s", dir.c_str() , FilesToRemove->Item(i).c_str() ); buf.Printf("%s%s", dir.c_str() , FilesToRemove->Item(i).c_str() );
buf2->Format(_("Deleting %s"), buf.c_str()); buf2->Format(_("Deleting %s"), buf.c_str());