You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2017/04/18 12:15:20 UTC

[14/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - - Made it possible to also accept the license agreement by setting an environment variable

- Made it possible to also accept the license agreement by setting an environment variable


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/ee771e65
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/ee771e65
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/ee771e65

Branch: refs/heads/feature/flash-downloader
Commit: ee771e6579486521b86f22a9fb629ff127edcfcd
Parents: 581567a
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Apr 11 08:43:08 2017 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Apr 11 08:43:08 2017 +0200

----------------------------------------------------------------------
 .../converter/retrievers/download/DownloadRetriever.java        | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/ee771e65/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
----------------------------------------------------------------------
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
index a29e2f4..2700464 100644
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
+++ b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
@@ -453,7 +453,12 @@ public class DownloadRetriever extends BaseRetriever {
         String property = "com.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted";
 
         // Implement the accepting the license by providing a system-id as system-property.
+        // Check a java property first ...
         String acceptedSystemIds = System.getProperty(property);
+        // Check an environment variable second ...
+        if(acceptedSystemIds == null) {
+            acceptedSystemIds = System.getenv("com.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted");
+        }
         if(acceptedSystemIds != null) {
             String systemId = SystemIdHelper.getSystemId();
             if(systemId != null) {