Revert "Add support for base64 provisioning"

This reverts commit ec4f9a2.
qzind · Jul 2, 2024 · 33c030e · 33c030e
1 parent ec4f9a2
commit 33c030e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 42 deletions.
diff --git a/build.xml b/build.xml
@@ -242,46 +242,23 @@
     </target>
 
     <target name="check-provision">
-        <!-- Check for base64 -->
-        <condition property="provision.message" value="Found provision base64 calling 'provision --base64 [...]'">
-            <isset property="provision.base64"/>
-        </condition>
-        <condition property="provision.format" value="--base64">
-            <isset property="provision.base64"/>
-        </condition>
-        <condition property="provision.data" value="${provision.base64}">
-            <isset property="provision.base64"/>
-        </condition>
-
-        <!-- Check for provisioning file -->
         <available file="${provision.file}" property="provision.file.exists"/>
         <condition property="provision.message" value="Found provision file '${provision.file}' calling 'provision --json [...]'">
             <isset property="provision.file.exists"/>
         </condition>
         <property description="Fallback value" name="provision.message" value="Skipping provisioning, '${provision.file}' does not exist."/>
-        <property description="Fallback value" name="provision.format" value="--json"/>
-        <property description="Fallback value" name="provision.data" value="${provision.file}"/>
-
-        <!-- Trigger provision target -->
-        <condition property="provision.needed" value="true">
-            <or>
-                <isset property="provision.base64"/>
-                <isset property="provision.file.exists"/>
-            </or>
-        </condition>
-
         <echo level="info">${provision.message}</echo>
     </target>
 
     <target name="clean-provision" depends="check-provision" unless="skip.clean.provision">
         <delete dir="${provision.dir}" includeemptydirs="true" defaultexcludes="false"/>
     </target>
 
-    <target name="provision" depends="check-provision,clean-provision" if="provision.needed">
+    <target name="provision" depends="check-provision,clean-provision" if="provision.file.exists">
         <java jar="${dist.dir}/${project.filename}.jar" fork="true" failonerror="true">
             <arg value="provision"/>
-            <arg value="${provision.format}"/>
-            <arg value="${provision.data}"/>
+            <arg value="--json"/>
+            <arg value="${provision.file}"/>
             <arg value="--target-os"/>
             <arg value="${target.os}"/>
             <arg value="--target-arch"/>

diff --git a/src/qz/utils/ArgParser.java b/src/qz/utils/ArgParser.java
@@ -11,7 +11,6 @@
 package qz.utils;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.ssl.Base64;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import qz.build.JLink;
@@ -24,7 +23,6 @@
 import qz.build.provision.ProvisionBuilder;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.List;
@@ -258,21 +256,11 @@ public ExitStatus processBuildArgs(ArgValue argValue) {
                     return SUCCESS;
                 case PROVISION:
                     ProvisionBuilder provisionBuilder;
-                    String param;
-                    if((param = valueOpt("--base64")) != null) {
-                        // Process JSON provision file (overwrites existing provisions)
-                        File tempFile = File.createTempFile("provision", ".json");
-                        log.info("Writing provisioning file from base64 {}", tempFile);
-                        log.info(param);
-                        byte[] decoded = Base64.decodeBase64(param);
-                        try(FileOutputStream outputStream = new FileOutputStream(tempFile)) {
-                            outputStream.write(decoded);
-                            provisionBuilder = new ProvisionBuilder(tempFile, valueOpt("--target-os"), valueOpt("--target-arch"));
-                            provisionBuilder.saveJson(true);
-                        }
-                    } else if((param = valueOpt("--json")) != null) {
+
+                    String jsonParam = valueOpt("--json");
+                    if(jsonParam != null) {
                         // Process JSON provision file (overwrites existing provisions)
-                        provisionBuilder = new ProvisionBuilder(new File(param), valueOpt("--target-os"), valueOpt("--target-arch"));
+                        provisionBuilder = new ProvisionBuilder(new File(jsonParam), valueOpt("--target-os"), valueOpt("--target-arch"));
                         provisionBuilder.saveJson(true);
                     } else {
                         // Process single provision step (preserves existing provisions)