Merge pull request #22 from leandrw/master

Make sure break line before next command

Author: pecigonzalo

README.md

@@ -1,7 +1,7 @@
 # Oh-My-Powershell
 [![Join the chat at https://gitter.im/pecigonzalo/Oh-My-Powershell](https://badges.gitter.im/pecigonzalo/Oh-My-Powershell.svg)](https://gitter.im/pecigonzalo/Oh-My-Powershell?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-After getting tired of mantaining my powershell profile, I decided to split the components and improve it, as I already use Oh-My-Zsh I thought it would be a good idea to have something similar on Powershell.
+After getting tired of mantaining my powershell profile, I decided to split the components and improve it, as I already use (Oh-My-Zsh)[ohmyz.sh] I thought it would be a good idea to have something similar on Powershell.
 
 Please feel free to submit issues/pull requests/questions/feature reqeusts.
 

themes/base.ps1

@@ -1,6 +1,7 @@
 function global:prompt {
     $realLASTEXITCODE = $LASTEXITCODE
     $Host.UI.RawUI.ForegroundColor = "White"
+    Write-Host
     Write-Host $pwd.ProviderPath -NoNewLine -ForegroundColor Green
     if($gitStatus){
         checkGit($pwd.ProviderPath)

themes/blocky.ps1

@@ -2,6 +2,7 @@
     $realCommandStatus = $?
     $realLASTEXITCODE = $LASTEXITCODE
     $Path = $pwd.ProviderPath
+    Write-Host
     Write-Host " $Path " -NoNewLine -ForegroundColor Black -BackgroundColor White
     if($gitStatus){
         checkGit($Path)

themes/golagola.ps1

@@ -10,7 +10,7 @@ function global:prompt {
 
     $Path = $pwd.ProviderPath
 
-
+    Write-Host 
     Write-Host "$env:USERNAME" -NoNewLine -ForegroundColor Magenta
     Write-Host " @" -NoNewLine -ForegroundColor Yellow
     Write-Host " $Path " -NoNewLine -ForegroundColor Green

themes/norm.ps1

@@ -0,0 +1,56 @@
+<# Based on norm zsh theme. Check it (https://github.com/robbyrussell/oh-my-zsh/blob/master/themes/norm.zsh-theme) #>
+
+function global:prompt {
+    $realCommandStatus = $?
+    $realLASTEXITCODE = $LASTEXITCODE
+    $lambda = [char]::ConvertFromUtf32(955)
+    $forwardArrow = [char]::ConvertFromUtf32(8594)
+
+    if ( $realCommandStatus -eq $True ) {
+      $EXIT="Yellow"
+    } else {
+      $EXIT="Red"
+    }      
+    
+    $CurrentDirectory = Split-Path -leaf -path (Get-Location)
+
+    Write-Host 
+    Write-Host "$lambda $env:USERNAME " -ForegroundColor Yellow -NoNewline 
+    Write-Host "$CurrentDirectory" -NoNewLine -ForegroundColor Green
+        
+    if(Get-GitStatus){
+        Write-Host " $forwardArrow $lambda " -ForegroundColor Yellow -NoNewline
+        Write-Host "git" -ForegroundColor Blue -NoNewline           
+        checkGit(Get-Location)
+    }
+
+    Write-Host " $forwardArrow" -NoNewLine -ForegroundColor $EXIT
+    $global:LASTEXITCODE = $realLASTEXITCODE
+    return " "
+}
+
+$global:PSColor = @{
+    File = @{
+        Default    = @{ Color = 'White' }
+        Directory  = @{ Color = 'Green'}
+        Reparse    = @{ Color = 'Magenta'}
+        Hidden     = @{ Color = 'DarkGray'; Pattern = '^\.' }
+        Code       = @{ Color = 'Magenta'; Pattern = '\.(java|c|cpp|cs|js|css|html|Dockerfile|gradle|
+            pp|packergitignore|gitattributes|go|)$' }
+        Executable = @{ Color = 'Green'; Pattern = '\.(exe|bat|cmd|py|pl|ps1|psm1|vbs|rb|reg|sh|fsx|)$' }
+        Text       = @{ Color = 'Cyan'; Pattern = '\.(txt|cfg|conf|ini|csv|log|config|
+            xml|yml|md|markdown|properties|json|todo)$' }
+        Compressed = @{ Color = 'Yellow'; Pattern = '\.(zip|tar|gz|rar|jar|war)$' }
+    }
+    Service = @{
+        Default = @{ Color = 'White' }
+        Running = @{ Color = 'DarkGreen' }
+        Stopped = @{ Color = 'DarkRed' }
+    }
+    Match = @{
+        Default    = @{ Color = 'White' }
+        Path       = @{ Color = 'Green'}
+        LineNumber = @{ Color = 'Yellow' }
+        Line       = @{ Color = 'White' }
+    }
+}

tools/check_for_updates.ps1

@@ -23,12 +23,18 @@ if ($AutoUpdate -eq $true) {
   if ($UpdateAfter -eq 0) { $update = 1 }
   # Call update script
   if ($update){
-    Write-Host "Starting update process"
-    & "$Env:USERPROFILE\.oh-my-powershell\update.ps1"
-    Add-CurrentTime
-    $update = 0
+    # Ask for user confirmation about update
+    $confirmation = Read-Host "Are you sure you want to update? [y/N]"
+    if ($confirmation -ieq "y"){
+        Write-Host "Starting update process"
+        & "$Env:USERPROFILE\.oh-my-powershell\update.ps1"
+        Add-CurrentTime
+        $update = 0
+    } else {
+        "Update canceled"
+    }    
   } else {
-    "No new updates to be installed"
+    "No updates avaiable"
   }
 }
 

update.ps1

@@ -9,15 +9,15 @@ if ($LASTEXITCODE) {
 }
 Pop-Location
 # Copy module to the user modules folder
-Write-Host "Installting Oh-My-Powershell Module"
+Write-Host "Installing Oh-My-Powershell Module"
 New-Item -Type Directory "$([Environment]::GetFolderPath("mydocuments"))\WindowsPowerShell\Modules" -Force | Out-Null
 Copy-Item -Recurse -Force $Env:USERPROFILE\.oh-my-powershell\modules\oh-my-powershell  `
   "$([Environment]::GetFolderPath("mydocuments"))\WindowsPowerShell\Modules\"
 
 # If all good, let the user know
 if ($?) {
   Write-Host "Updated Oh-My-Powershell successfully!" -ForegroundColor Green
-  Write-Host 'PLEASE RELOAD YOUR PROFILE DOING: .$PROFILE' -ForegroundColor Green
+  Write-Host "PLEASE RELOAD YOUR PROFILE DOING: `n.$PROFILE" -ForegroundColor Green
 } else {
   Write-Host "Something went wrong with the update, you might need to reinstall" -ForegroundColor Red
 }