[webkitperl] Check for custom Flatpak user dirs in webkitdirs.pm
authorlmoura@igalia.com <lmoura@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Sep 2020 14:17:53 +0000 (14:17 +0000)
committerlmoura@igalia.com <lmoura@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Sep 2020 14:17:53 +0000 (14:17 +0000)
https://bugs.webkit.org/show_bug.cgi?id=216959

Reviewed by Philippe Normand.

* Scripts/webkitdirs.pm: Check for WEBKIT_FLATPAK_USER_DIR
(getUserFlatpakPath):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267567 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitdirs.pm

index ded41ef..313132e 100644 (file)
@@ -1,3 +1,13 @@
+2020-09-25  Lauro Moura  <lmoura@igalia.com>
+
+        [webkitperl] Check for custom Flatpak user dirs in webkitdirs.pm
+        https://bugs.webkit.org/show_bug.cgi?id=216959
+
+        Reviewed by Philippe Normand.
+
+        * Scripts/webkitdirs.pm: Check for WEBKIT_FLATPAK_USER_DIR
+        (getUserFlatpakPath):
+
 2020-09-25  Youenn Fablet  <youenn@apple.com>
 
         Introduce WKWebViewConfiguration mediaCaptureEnabled
index 4b6f625..b7f51ad 100755 (executable)
@@ -2163,6 +2163,10 @@ sub getJhbuildModulesetName()
 
 sub getUserFlatpakPath()
 {
+    if (defined($ENV{'WEBKIT_FLATPAK_USER_DIR'})) {
+       return $ENV{'WEBKIT_FLATPAK_USER_DIR'};
+    }
+
     my $productDir = baseProductDir();
     if (isGit() && isGitBranchBuild() && gitBranch()) {
         my $branch = gitBranch();