Merge pull request #858 from AppImage/improve-appimage-extract-and-run

Improve --appimage-extract-and-run

Author: TheAssassin

src/runtime.c

@@ -602,6 +602,28 @@ int main(int argc, char *argv[]) {
         exit(0);
     }
 
+    // calculate full path of AppImage
+    int length;
+    char fullpath[PATH_MAX];
+
+    if(getenv("TARGET_APPIMAGE") == NULL) {
+        // If we are operating on this file itself
+        ssize_t len = readlink(appimage_path, fullpath, sizeof(fullpath));
+        if (len < 0) {
+            perror("Failed to obtain absolute path");
+            exit(EXIT_EXECERROR);
+        }
+        fullpath[len] = '\0';
+    } else {
+        char* abspath = realpath(appimage_path, NULL);
+        if (abspath == NULL) {
+            perror("Failed to obtain absolute path");
+            exit(EXIT_EXECERROR);
+        }
+        strcpy(fullpath, abspath);
+        free(abspath);
+    }
+
     if (arg && strcmp(arg, "appimage-extract-and-run") == 0) {
         char* hexlified_digest = NULL;
 
@@ -662,6 +684,11 @@ int main(int argc, char *argv[]) {
             }
             new_argv[new_argc] = NULL;
 
+            /* Setting some environment variables that the app "inside" might use */
+            setenv("APPIMAGE", fullpath, 1);
+            setenv("ARGV0", argv0_path, 1);
+            setenv("APPDIR", prefix, 1);
+
             execv(apprun_path, new_argv);
 
             int error = errno;
@@ -838,18 +865,6 @@ int main(int argc, char *argv[]) {
             for (;;) pause();
         }
 
-        int length;
-        char fullpath[PATH_MAX];
-
-        if(getenv("TARGET_APPIMAGE") == NULL){
-            // If we are operating on this file itself
-            length = readlink(appimage_path, fullpath, sizeof(fullpath));
-            fullpath[length] = '\0';
-        } else {
-            // If we are operating on a different AppImage than this file
-            sprintf(fullpath, "%s", appimage_path); // TODO: Make absolute
-        }
-
         /* Setting some environment variables that the app "inside" might use */
         setenv( "APPIMAGE", fullpath, 1 );
         setenv( "ARGV0", argv0_path, 1 );