Fix features options setting WslApplyFeatures.php

Because the features options are set in the evnirronement variables in https://github.com/laravel/homestead/blob/98a798b18a078121252f0ecfe3e10cba050ce504/scripts/homestead.rb#L308-L311 it must be the same in the WSL code
laravel · Jul 20, 2024 · f21aebb · f21aebb
1 parent 36bd28d
commit f21aebb
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/WslApplyFeatures.php b/src/WslApplyFeatures.php
@@ -77,16 +77,17 @@ public function execute(InputInterface $input, OutputInterface $output)
             $feature_cmd = '';
             $feature_name = array_key_first($feature);
             $feature_variables = $feature[$feature_name];
-            $output->writeln(PHP_EOL.($feature[$feature_name] ? '' : 'Not ').'Configuring feature: '.$feature_name);
-            if ($feature_variables !== false) {
-                $feature_path = "{$this->featuresPath}/{$feature_name}.sh | tee ~/.homestead-features/{$feature_name}.log";
+            $output->writeln(PHP_EOL.($feature[$feature_name] ? '' : 'Not ').'Configuring feature: '.$feature_name);           
+			if ($feature_variables !== false) {
                 // Prepare the feature variables if provided.
-                if (is_array($feature_variables)) {
-                    $variables = join(' ', $feature_variables);
-                    $feature_cmd = "sudo -E bash {$feature_path} {$variables}";
-                } else {
-                    $feature_cmd = "sudo -E bash {$feature_path}";
-                }
+				if (is_array($feature_variables)) {
+					foreach ($feature_variables as $var_name => $var_value) {
+						$output->writeln("Set option ".$var_name." = ".$var_value);
+						putenv("$var_name=$var_value");
+					}
+				}
+				$feature_path = "{$this->featuresPath}/{$feature_name}.sh | tee ~/.homestead-features/{$feature_name}.log";
+                $feature_cmd = "sudo -E bash {$feature_path}";				
                 shell_exec($feature_cmd);
                 $output->writeln("Feature installation log can be found via: sudo cat ~/.homestead-features/{$feature_name}.log");
             }