From 37068c70a9a0caaf65703f2831c01d1eb754e174 Mon Sep 17 00:00:00 2001
From: Kenn Sebesta <kenn@eissQ.com>
Date: Sat, 12 Mar 2022 12:17:19 -0500
Subject: [PATCH] [Make][Windows] Replace `pwsh` by `powershell`

This calls the "Powershell for Windows" instead of the "MS Powershell"
console.
---
 ChibiOS_3.0.5/os/hal/hal.mk                            | 2 +-
 ChibiOS_3.0.5/os/hal/ports/STM32/STM32F4xx/platform.mk | 2 +-
 ChibiOS_3.0.5/os/rt/rt.mk                              | 2 +-
 Makefile                                               | 6 +++---
 make/tools.mk                                          | 8 ++++----
 make/windows.mk                                        | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ChibiOS_3.0.5/os/hal/hal.mk b/ChibiOS_3.0.5/os/hal/hal.mk
index 3d4a6277..8416f6d0 100644
--- a/ChibiOS_3.0.5/os/hal/hal.mk
+++ b/ChibiOS_3.0.5/os/hal/hal.mk
@@ -3,7 +3,7 @@
 ifeq ($(USE_SMART_BUILD),yes)
 
 ifeq ($(OS),Windows_NT)
-  HALCONF := $(strip $(shell pwsh -noprofile -command cat halconf.h | findstr -i define))
+  HALCONF := $(strip $(shell powershell -noprofile -command cat halconf.h | findstr -i define))
 else
   HALCONF := $(strip $(shell cat halconf.h | egrep -e "define"))
 endif
diff --git a/ChibiOS_3.0.5/os/hal/ports/STM32/STM32F4xx/platform.mk b/ChibiOS_3.0.5/os/hal/ports/STM32/STM32F4xx/platform.mk
index 5f58ea62..d02cfa08 100644
--- a/ChibiOS_3.0.5/os/hal/ports/STM32/STM32F4xx/platform.mk
+++ b/ChibiOS_3.0.5/os/hal/ports/STM32/STM32F4xx/platform.mk
@@ -2,7 +2,7 @@
 ifeq ($(USE_SMART_BUILD),yes)
 
 ifeq ($(OS),Windows_NT)
-  HALCONF := $(strip $(shell pwsh -noprofile -command cat halconf.h | findstr -i define))
+  HALCONF := $(strip $(shell powershell -noprofile -command cat halconf.h | findstr -i define))
 else
   HALCONF := $(strip $(shell cat halconf.h | egrep -e "define"))
 endif
diff --git a/ChibiOS_3.0.5/os/rt/rt.mk b/ChibiOS_3.0.5/os/rt/rt.mk
index f9e09f3e..bf9e865e 100644
--- a/ChibiOS_3.0.5/os/rt/rt.mk
+++ b/ChibiOS_3.0.5/os/rt/rt.mk
@@ -3,7 +3,7 @@
 ifeq ($(USE_SMART_BUILD),yes)
 
 ifeq ($(OS),Windows_NT)
-  CHCONF := $(strip $(shell pwsh -noprofile -command cat chconf.h | findstr -i define))
+  CHCONF := $(strip $(shell powershell -noprofile -command cat chconf.h | findstr -i define))
 else
   CHCONF := $(strip $(shell cat chconf.h | egrep -e "define")),
 endif
diff --git a/Makefile b/Makefile
index 92c436c5..557d426e 100644
--- a/Makefile
+++ b/Makefile
@@ -174,7 +174,7 @@ fw_$(1)_clean:
 ifneq ($(OSFAMILY), windows)
 	$(V1) [ ! -d "$(BUILD_DIR)/$(1)" ] || $(RM) -r "$(BUILD_DIR)/$(1)"
 else
-	$(V1) pwsh -noprofile -command if (Test-Path $(BUILD_DIR)/$(1)) {Remove-Item -Recurse $(BUILD_DIR)/$(1)}
+	$(V1) powershell -noprofile -command if (Test-Path $(BUILD_DIR)/$(1)) {Remove-Item -Recurse $(BUILD_DIR)/$(1)}
 endif
 endef
 
@@ -228,7 +228,7 @@ all_fw_package: all_fw all_fw_package_clean
 ifneq ($(OSFAMILY), windows)
 	$(V1) $(RM) $(BUILD_CRUFT)
 else
-	$(V1) pwsh -noprofile -command {Remove-Item $(BUILD_CRUFT)}
+	$(V1) powershell -noprofile -command {Remove-Item $(BUILD_CRUFT)}
 endif
 
 .PHONY: all_fw_package_clean
@@ -237,7 +237,7 @@ all_fw_package_clean:
 ifneq ($(OSFAMILY), windows)
 	$(V1) [ ! -d "$(ROOT_DIR)/package/" ] || $(RM) -rf $(ROOT_DIR)/package/*
 else
-	$(V1) pwsh -noprofile -command if (Test-Path $(ROOT_DIR)/package/*) {Remove-Item -Recurse $(ROOT_DIR)/package/*}
+	$(V1) powershell -noprofile -command if (Test-Path $(ROOT_DIR)/package/*) {Remove-Item -Recurse $(ROOT_DIR)/package/*}
 endif
 
 
diff --git a/make/tools.mk b/make/tools.mk
index 66db198c..2618a3c5 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -38,7 +38,7 @@ ifneq ($(OSFAMILY), windows)
 	$(V1) tar -C $(TOOLS_DIR) -xjf "$(DL_DIR)/$(ARM_SDK_FILE)"
 else
 	$(V1) curl --continue - --location --insecure --output "$(DL_DIR)/$(ARM_SDK_FILE)" "$(ARM_SDK_URL)"
-	$(V1) pwsh -noprofile -command Expand-Archive -DestinationPath $(ARM_SDK_DIR) -LiteralPath "$(DL_DIR)/$(ARM_SDK_FILE)"
+	$(V1) powershell -noprofile -command Expand-Archive -DestinationPath $(ARM_SDK_DIR) -LiteralPath "$(DL_DIR)/$(ARM_SDK_FILE)"
 
 endif
 
@@ -47,7 +47,7 @@ arm_sdk_clean:
 ifneq ($(OSFAMILY), windows)
 	$(V1) [ ! -d "$(ARM_SDK_DIR)" ] || $(RM) -r $(ARM_SDK_DIR)
 else
-	$(V1) pwsh -noprofile -command if (Test-Path $(ARM_SDK_DIR)) {Remove-Item -Recurse $(ARM_SDK_DIR)}
+	$(V1) powershell -noprofile -command if (Test-Path $(ARM_SDK_DIR)) {Remove-Item -Recurse $(ARM_SDK_DIR)}
 endif
 
 
@@ -96,7 +96,7 @@ qt_sdk_clean:
 ifneq ($(OSFAMILY), windows)
 	$(V1) [ ! -d "$(QT_SDK_DIR)" ] || $(RM) -r $(QT_SDK_DIR)
 else
-	$(V1) pwsh -noprofile -command if (Test-Path $(QT_SDK_DIR)) {Remove-Item -Recurse $(QT_SDK_DIR)}
+	$(V1) powershell -noprofile -command if (Test-Path $(QT_SDK_DIR)) {Remove-Item -Recurse $(QT_SDK_DIR)}
 endif
 
 
@@ -168,7 +168,7 @@ qt_creator_clean: qt_creator_uninstall
 ifneq ($(OSFAMILY), windows)
 	$(V1) [ ! -d "$(QT_CREATOR_DIR)" ] || $(RM) -r $(QT_CREATOR_DIR)
 else
-	$(V1) pwsh -noprofile -command if (Test-Path $(QT_CREATOR_DIR)) {Remove-Item -Recurse $(QT_CREATOR_DIR)}
+	$(V1) powershell -noprofile -command if (Test-Path $(QT_CREATOR_DIR)) {Remove-Item -Recurse $(QT_CREATOR_DIR)}
 endif
 
 
diff --git a/make/windows.mk b/make/windows.mk
index bbd734a6..ef449ba4 100644
--- a/make/windows.mk
+++ b/make/windows.mk
@@ -45,4 +45,4 @@ export PYTHON
 ############################
 
 RM := del
-MKDIR := pwsh -noprofile -command New-Item -Force -itemtype "directory"
+MKDIR := powershell -noprofile -command New-Item -Force -itemtype "directory"