Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	scriptsharp/ScriptSharp/Script5N6.cs
  • Loading branch information
PierreOlivierBrillant committed Oct 16, 2024
2 parents 5556e65 + 94a0aec commit 166dae9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scriptsharp/ScriptSharp/Script5N6.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ await Task.WhenAll(
Utils.RunCommand(Program.PathToAndroidStudio() + " installPlugins com.github.copilot");
Utils.RunCommand(Program.PathToAndroidStudio() + " installPlugins com.localizely.flutter-intl");
await InstallFlutter();
Utils.StartKmb();
//Utils.StartKMB();
Utils.AddToPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "AppData",
"Local", "Pub", "Cache", "bin"));
Utils.RunCommand("npm install -g firebase-tools");
Expand Down
2 changes: 1 addition & 1 deletion scriptsharp/ScriptSharp/Utils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ private static void RunPowerShellCommand(string command)
{
ProcessStartInfo processStartInfo = new ProcessStartInfo
{
FileName = "powershell.exe",
FileName = "pwsh.exe",
Arguments = $"-Command \"{command}\"",
RedirectStandardOutput = true,
UseShellExecute = false,
Expand Down

0 comments on commit 166dae9

Please sign in to comment.