amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some minor compile/install bugs.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@766 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2007-10-17 04:27:08 +00:00
parent cca633aa38
commit d0506a59f4
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/update_checker.cpp
+8 -8
View File
@@ -330,9 +330,9 @@ class RecursiveDeleter : public wxDirTraverser {
wxDirTraverseResult OnFile(const String& filename) { wxDirTraverseResult OnFile(const String& filename) {
if (!wxRemoveFile(filename)) if (!wxRemoveFile(filename))
handle_error(_("Cannot delete ") + filename + _(". " handle_error(_("Cannot delete ") + filename + _(". ")
"The remainder of the package has still been removed, if possible." _("The remainder of the package has still been removed, if possible.")
"Other packages may have been removed, including packages that this on is dependent on. Please remove manually.")); _("Other packages may have been removed, including packages that this on is dependent on. Please remove manually."));
return wxDIR_CONTINUE; return wxDIR_CONTINUE;
} }
@@ -483,8 +483,8 @@ void UpdatesWindow::onApplyChanges(wxCommandEvent& ev) {
rd.finishDelete(); rd.finishDelete();
} else { } else {
if (!wxRemoveFile(filename)) if (!wxRemoveFile(filename))
handle_error(_("Cannot delete ") + filename + _(" to remove package ") + pack->name + _(". " handle_error(_("Cannot delete ") + filename + _(" to remove package ") + pack->name + _(". ")
"Other packages may have been removed, including packages that this on is dependent on. Please remove manually.")); _("Other packages may have been removed, including packages that this on is dependent on. Please remove manually."));
} }
} }
@@ -492,9 +492,9 @@ void UpdatesWindow::onApplyChanges(wxCommandEvent& ev) {
wxURL url(pack->url); wxURL url(pack->url);
wxInputStream* is = url.GetInputStream(); wxInputStream* is = url.GetInputStream();
if (!is) { if (!is) {
handle_error(_("Cannot fetch file ") + pack->url + _(" to install package ") + pack->name + _(". " handle_error(_("Cannot fetch file ") + pack->url + _(" to install package ") + pack->name + _(". ")
"Other packages may have been installed, including packages that depend on this one. " _("Other packages may have been installed, including packages that depend on this one. ")
"Please remove those packages manually or install this one manually.")); _("Please remove those packages manually or install this one manually."));
} }
wxString filename = wxFileName::CreateTempFileName(_("")); wxString filename = wxFileName::CreateTempFileName(_(""));
wxFileOutputStream os (filename); wxFileOutputStream os (filename);
tools/linux-installer/install
+2 -2
View File
@@ -8,8 +8,8 @@
# If executed as root (including via sudo), it is installed to /usr/local/share/magicseteditor. (with an executable symlink in /usr/local/bin) # If executed as root (including via sudo), it is installed to /usr/local/share/magicseteditor. (with an executable symlink in /usr/local/bin)
# If executed as any other user, it will fail. # If executed as any other user, it will fail.
case `id -un` in case $UID in
root) 0)
INSTALL_DIR='/usr/local/share/magicseteditor/'; INSTALL_DIR='/usr/local/share/magicseteditor/';
EXEC_SYMLINK='/usr/local/bin/magicseteditor';; EXEC_SYMLINK='/usr/local/bin/magicseteditor';;
*) *)