From dc6e361144782aba44f12d55b98e632a5e09eaaf Mon Sep 17 00:00:00 2001
From: ayltai <ayltai@gmail.com>
Date: Wed, 8 Jul 2020 16:36:06 +0800
Subject: [PATCH] Fix Exec task command line arguments for Terraform variables

---
 build.gradle                                                | 2 +-
 .../java/com/github/ayltai/gradle/plugin/BaseApplyTask.java | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 24bc392..fe6952b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 }
 
 group 'com.github.ayltai'
-version '0.2.10'
+version '0.2.11'
 
 sourceCompatibility = 8
 targetCompatibility = 8
diff --git a/src/main/java/com/github/ayltai/gradle/plugin/BaseApplyTask.java b/src/main/java/com/github/ayltai/gradle/plugin/BaseApplyTask.java
index a6f0739..5d0d401 100644
--- a/src/main/java/com/github/ayltai/gradle/plugin/BaseApplyTask.java
+++ b/src/main/java/com/github/ayltai/gradle/plugin/BaseApplyTask.java
@@ -87,7 +87,11 @@ protected List<String> getCommandLineArgs() {
         if (!this.variables.isEmpty()) {
             this.variables.forEach(variable -> {
                 args.addAll(variable.files.stream().map(file -> "-var-file=" + file.getAbsolutePath()).collect(Collectors.toList()));
-                args.addAll(variable.vars.stream().map(var -> String.format(Locale.US, "-var '%1$s=%2$s'", var.name, var.value)).collect(Collectors.toList()));
+
+                variable.vars.forEach(var -> {
+                    args.add("-var");
+                    args.add(String.format(Locale.US, "'%1$s=%2$s'", var.name, var.value));
+                });
             });
         }