Codespace prompt (#16)

* Multi-line codespace prompt

* Install Terraform via apt-get

* Remove PS modules not used

Author: geekzter

common/bootstrap_pwsh.ps1

@@ -13,16 +13,15 @@ $functionsDirectory = Join-Path $scriptDirectory functions
 if (-not $NoPackages) {
     # Check whether Az modules have been installed
     AddorUpdateModule -ModuleName Az -AllowClobber
-    #AddorUpdateModule AzureADPreview
     #AddorUpdateModule MicrosoftPowerBIMgmt
     #AddorUpdateModule MicrosoftTeams
     AddorUpdateModule Oh-My-Posh
     AddorUpdateModule Posh-Git
-    # https://docs.microsoft.com/en-us/powershell/scripting/whats-new/what-s-new-in-powershell-72?view=powershell-7.2#separating-dsc-from-powershell-7-to-enable-future-improvements
-    if ($PSVerSionTable.PSVersion -ge 7.2) {
-        # The PSDesiredStateConfiguration module was removed from the PowerShell 7.2 package and is now published to the PowerShell Gallery
-        AddorUpdateModule PSDesiredStateConfiguration
-    }
+    # # https://docs.microsoft.com/en-us/powershell/scripting/whats-new/what-s-new-in-powershell-72?view=powershell-7.2#separating-dsc-from-powershell-7-to-enable-future-improvements
+    # if ($PSVerSionTable.PSVersion -ge 7.2) {
+    #     # The PSDesiredStateConfiguration module was removed from the PowerShell 7.2 package and is now published to the PowerShell Gallery
+    #     AddorUpdateModule PSDesiredStateConfiguration
+    # }
     AddorUpdateModule PSReadLine
     # https://docs.microsoft.com/en-us/powershell/scripting/whats-new/what-s-new-in-powershell-72?view=powershell-7.2#psreadline-21-predictive-intellisense
     $psReadLineOptionCommand = (Get-Command Set-PSReadLineOption -ErrorAction SilentlyContinue)
@@ -31,7 +30,7 @@ if (-not $NoPackages) {
     }
     AddorUpdateModule SqlServer
     AddorUpdateModule Terminal-Icons
-    AddorUpdateModule VSTeam
+    # AddorUpdateModule VSTeam
     if ($IsWindows) {
         AddorUpdateModule WindowsCompatibility
     }

common/profile.ps1

@@ -1,13 +1,5 @@
 #!/usr/bin/env pwsh
 
-# Define Functions
-Write-Verbose "Defining functions..."
-$functionsPath = (Join-Path (Split-Path $MyInvocation.MyCommand.Path –Parent) "functions")
-Get-ChildItem $functionsPath -filter "*.ps1" | ForEach-Object {
-    Write-Host "$($_.FullName) : loaded"
-    . $_.FullName
-}
-
 # Define prompt
 Write-Verbose "Defining prompt..."
 function global:Prompt {
@@ -17,11 +9,15 @@ function global:Prompt {
         $GitPromptSettings.DefaultPromptAbbreviateHomeDirectory = $true 
         # Don't overwrite the title set in iTerm2/Windows Terminal
         $GitPromptSettings.WindowTitle = $null
+        if ($env:CODESPACES -ieq "true") {
+            $GitPromptSettings.DefaultPromptPrefix = "[${env:GITHUB_USER}@${env:CODESPACE_NAME}]: "
+            $GitPromptSettings.DefaultPromptBeforeSuffix.Text = '`n'            
+        }
         if (IsElevated) {
             $GitPromptSettings.DefaultPromptSuffix = "`$('#' * (`$nestedPromptLevel + 1)) "
         } else {
             $GitPromptSettings.DefaultPromptSuffix = "`$('>' * (`$nestedPromptLevel + 1)) "
-        }
+        }    
         $prompt = (& $GitPromptScriptBlock)
     } else {
         $host.ui.rawui.WindowTitle = "PowerShell Core $($host.Version.ToString())"
@@ -50,7 +46,17 @@ function global:Prompt {
 }
 
 # Only print when not in a nested shell, tmux session, or Codespace
-$printMessages = (($nestedPromptLevel -eq 0) -and $($env:TERM -notmatch "^screen") -and $($env:TERM -notmatch "^tmux") -and (!($env:CLOUDENV_ENVIRONMENT_ID)))
+$printMessages = (($nestedPromptLevel -eq 0) -and $($env:TERM -notmatch "^screen") -and $($env:TERM -notmatch "^tmux") -and (!($env:CODESPACES -ieq "true")))
+
+# Define Functions
+Write-Verbose "Defining functions..."
+$functionsPath = (Join-Path (Split-Path $MyInvocation.MyCommand.Path –Parent) "functions")
+Get-ChildItem $functionsPath -filter "*.ps1" | ForEach-Object {
+    if ($printMessages) {
+        Write-Host "$($_.FullName) : loaded"
+    }
+    . $_.FullName
+}
 
 if ($host.Name -eq 'ConsoleHost')
 {

linux/apt-packages.txt

@@ -28,10 +28,12 @@ msodbcsql17
 mssql-tools
 nano
 node-typescript
+packer
 powershell
 sed
 snapd
 telnet
+terraform
 tmux
 traceroute
 tree

linux/bootstrap_linux2.sh

@@ -64,7 +64,7 @@ else
             echo $'\napt-get not found, skipping packages'
         else
             # pre-requisites
-            $SUDO apt-get install -y apt-transport-https curl software-properties-common
+            $SUDO apt-get install -y apt-transport-https curl gnupg software-properties-common
 
             # Kubernetes requirement
             curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | $SUDO apt-key add -
@@ -87,6 +87,10 @@ EOF
             # For Ubuntu, this PPA provides the latest stable upstream Git version
             $SUDO add-apt-repository ppa:git-core/ppa -y
 
+            # Hashicorp
+            curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
+            sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+
             # Microsoft dependencies
             # Source: https://github.com/Azure/azure-functions-core-tools
             curl -s https://packages.microsoft.com/keys/microsoft.asc | $SUDO apt-key add -
@@ -108,6 +112,7 @@ EOF
                 $SUDO dpkg -i packages-microsoft-prod.deb
             fi
 
+
             echo $'\nUpdating package list...'
             $SUDO apt-get update
 
@@ -137,19 +142,4 @@ if test ! $(which pwsh); then
 else
     echo $'\nSetting up PowerShell Core...'
     pwsh -nop -file $SCRIPT_PATH/../common/common_setup.ps1 $COMMON_SETUP_ARGS
-fi
-
-# Set up terraform with tfenv
-if test $(which unzip); then
-    if [ ! -d $HOME/.tfenv ]; then
-        echo $'\nInstalling tfenv...'
-        git clone -q https://github.com/tfutils/tfenv.git $HOME/.tfenv
-    else
-        echo $'\nUpdating tfenv...'
-        git -C $HOME/.tfenv pull
-    fi
-    TFENV_CURL_OUTPUT=0
-    $HOME/.tfenv/bin/tfenv install latest #2>&1
-else
-    echo $'\nunzip not found, skipping tfenv set up'
-fi
+fi