Skip to content

M
magicseteditor
Commit 4e62cf02 authored by coppro's avatar coppro
Browse files
Options

Fixed some minor compile/install bugs.

parent e65a1018
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
src/gui/update_checker.cpp
View file @ 4e62cf02
...@@ -330,9 +330,9 @@ class RecursiveDeleter : public wxDirTraverser { ...@@ -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) { ...@@ -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) { ...@@ -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
View file @ 4e62cf02
...@@ -8,8 +8,8 @@ ...@@ -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';;
*) *)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment