1 files changed, 10 insertions, 7 deletions

diff --git a/src/app.c b/src/app.c
index 148bba52..abcf95da 100644
--- a/src/app.c
+++ b/src/app.c
@@ -23,7 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "app.h"
 #include "bookmarks.h"
 #include "defs.h"
-#include "embedded.h"
+#include "resources.h"
 #include "feeds.h"
 #include "mimehooks.h"
 #include "gmcerts.h"
@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "ipc.h"
 #include "periodic.h"
 #include "sitespec.h"
+#include "updater.h"
 #include "ui/certimportwidget.h"
 #include "ui/color.h"
 #include "ui/command.h"
@@ -711,19 +712,17 @@ static void init_App_(iApp *d, int argc, char **argv) {
         }
         SDL_free(exec);
     }
-#if defined (iHaveLoadEmbed)
     /* Load the resources from a file. Check the executable directory first, then a
        system-wide location, and as a final fallback, the current working directory. */ {
-        if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) {
-            if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
-                if (!load_Embed("resources.lgr")) {
+        if (!init_Resources(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) {
+            if (!init_Resources(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
+                if (!init_Resources("resources.lgr")) {
                     fprintf(stderr, "failed to load resources: %s\n", strerror(errno));
                     exit(-1);
                 }
             }
         }
     }
-#endif
     init_Lang();
     /* Configure the valid command line options. */ {
         defineValues_CommandLine(&d->args, "close-tab", 0);
@@ -742,7 +741,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     iStringList *openCmds = new_StringList();
     /* Handle command line options. */ {
         if (contains_CommandLine(&d->args, "help")) {
-            puts(cstr_Block(&blobArghelp_Embedded));
+            puts(cstr_Block(&blobArghelp_Resources));
             terminate_App_(0);
         }
         if (contains_CommandLine(&d->args, "version;V")) {
@@ -3127,6 +3126,10 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iFalse;
     }
+    else if (equal_Command(cmd, "updater.check")) {
+        checkNow_Updater();
+        return iTrue;
+    }
     else if (equal_Command(cmd, "fontpack.enable")) {
         const iString *packId = collect_String(suffix_Command(cmd, "id"));
         enablePack_Fonts(packId, arg_Command(cmd));