Misc (#24)

* Overrule TF resource check

* Install Beyond Compare

* Fix PATH

Author: geekzter

common/functions/terraform.ps1

@@ -133,15 +133,16 @@ function Erase-TerraformAzureResources {
     }
 
     try {
-        # Validate whether non-azurerm resources are present
-        terraform state list | Select-String -Pattern "^((?!data).)*$" | Select-String -Pattern '\.(azuredevops|azuread)_' | Set-Variable aadOrAzdoResources
-        if ($aadOrAzdoResources) {
-            Write-Warning "The following resources are present in the Terraform state, which are not supported by this function:"
-            $aadOrAzdoResources
-            return
+        if (!$Force) {
+            # Validate whether non-azurerm resources are present
+            terraform state list | Select-String -Pattern "^((?!data).)*$" | Select-String -Pattern '\.(azuredevops|azuread)_' | Set-Variable aadOrAzdoResources
+            if ($aadOrAzdoResources) {
+                Write-Warning "The following resources are present in the Terraform state, which are not supported by this function:"
+                $aadOrAzdoResources
+                return
+            }
         }
 
-
         if (!$Repository) {
             $Repository = Find-RepositoryDirectory            
         }

common/profile.ps1

@@ -58,16 +58,6 @@ Get-ChildItem $functionsPath -filter "*.ps1" | ForEach-Object {
     . $_.FullName
 }
 
-if ($host.Name -eq 'ConsoleHost')
-{
-    Import-InstalledModule posh-git
-    # Import-InstalledModule oh-my-posh
-    # Requires PSReadLine 2.0
-    #Set-Theme Agnoster
-    #Set-Theme Paradox
-    Import-InstalledModule Terminal-Icons
-}
-
 if ($IsWindows) {
     $env:HOME ??= "${env:HOMEDRIVE}${env:HOMEPATH}"
     $env:SOURCES_DIR = (Join-Path $env:HOME "Source")
@@ -85,6 +75,8 @@ if ($PSVersionTable.PSEdition -and ($PSVersionTable.PSEdition -eq "Core") -and (
     # Manage PATH environment variable
     [System.Collections.ArrayList]$pathList = $env:PATH.Split(":")
     [System.Collections.ArrayList]$directories = @(
+        "/bin",
+        "/usr/bin",
         "/usr/local/bin",
         "~/.dotnet/tools",
         "/usr/local/share/dotnet"
@@ -144,6 +136,16 @@ if (Test-Path -Path $environmentPath) {
     }
 }
 
+if ($host.Name -eq 'ConsoleHost')
+{
+    Import-InstalledModule posh-git
+    # Import-InstalledModule oh-my-posh
+    # Requires PSReadLine 2.0
+    #Set-Theme Agnoster
+    #Set-Theme Paradox
+    Import-InstalledModule Terminal-Icons
+}
+
 if ($printMessages) {
 
     $azModule = Get-Module Az -ListAvailable | Select-Object -First 1     

macOS/Brewfile

@@ -19,6 +19,7 @@ tap "z80oolong/tmux"
 cask "azure-data-studio"
 cask "cameracontroller"
 cask "db-browser-for-sqlite"
+cask "beyond-compare"
 cask "docker"
 cask "dotnet-sdk"
 #cask "dropbox"

windows/chocolatey-developer.config

@@ -10,6 +10,7 @@
     <package id="azure-functions-core-tools" packageParameters="/x64:true"/>
     <!-- package id="azurepowershell" /-->
     <package id="azurestorageemulator" />
+    <package id="beyondcompare" />
     <!-- package id="bosh-cli" /-->
     <package id="cascadiacode" />
     <package id="cascadiacodepl" />