Merge pull request #27 from pecigonzalo/rename

v0.7

Author: pecigonzalo

README.md

@@ -1,5 +1,5 @@
-# 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)
+# Oh-My-Posh
+[![Join the chat at https://gitter.im/pecigonzalo/Oh-My-Posh](https://badges.gitter.im/pecigonzalo/Oh-My-Posh.svg)](https://gitter.im/pecigonzalo/Oh-My-Posh?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)[ohmyz.sh] I thought it would be a good idea to have something similar on Powershell.
 
@@ -13,7 +13,7 @@ Requires:
 
 Run:
 ```
-iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/pecigonzalo/Oh-My-Powershell/master/install.ps1'))
+iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/pecigonzalo/Oh-My-Posh/master/install.ps1'))
 ```
 
 Add the following line to your powershell profile:

install.ps1

@@ -10,31 +10,31 @@ function Install-OMP {
   Check-Recommends
   Check-Dependencies
 
-  Write-Output "Deleting $Env:USERPROFILE\.oh-my-powershell"
-  Remove-Item -Force -Recurse "$Env:USERPROFILE\.oh-my-powershell" -ErrorAction SilentlyContinue
+  Write-Output "Deleting $Env:USERPROFILE\.oh-my-posh"
+  Remove-Item -Force -Recurse "$Env:USERPROFILE\.oh-my-posh" -ErrorAction SilentlyContinue
   if ($local) {
     # Deploy from current folder
-    Write-Output "Coping Oh-My-Powershell to its destination"
-    Copy-Item -Recurse -Force .\  "$Env:USERPROFILE\.oh-my-powershell\"
+    Write-Output "Coping Oh-My-Posh to its destination"
+    Copy-Item -Recurse -Force .\  "$Env:USERPROFILE\.oh-my-posh\"
   } else {
     # Clone project
-    Write-Output "Cloning Oh-My-Powershell from Github"
-    git clone https://github.com/pecigonzalo/Oh-My-Powershell.git $Env:USERPROFILE\.oh-my-powershell
+    Write-Output "Cloning Oh-My-Posh from Github"
+    git clone https://github.com/pecigonzalo/Oh-My-Posh.git $Env:USERPROFILE\.oh-my-posh
   }
   # Copy module to the user modules folder
-  Write-Output "Installting Oh-My-Powershell Module"
+  Write-Output "Installting Oh-My-Posh 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  `
+  Copy-Item -Recurse -Force $Env:USERPROFILE\.oh-my-posh\modules\oh-my-posh  `
     "$([Environment]::GetFolderPath("mydocuments"))\WindowsPowerShell\Modules\"
 }
 
 #
 # Install logic
 #
-if ( Test-Path $Env:USERPROFILE\.oh-my-powershell ) {
-  Write-Output "Oh-My-Powershell is already installed"
+if ( Test-Path $Env:USERPROFILE\.oh-my-posh ) {
+  Write-Output "Oh-My-Posh is already installed"
   if ( $force -eq $true ) {
-    Write-Output "Reinstalling Oh-My-Powershell"
+    Write-Output "Reinstalling Oh-My-Posh"
     Install-OMP
   }
 } else {

modules/oh-my-powershell/oh-my-powershell.psd1 renamed to modules/oh-my-posh/oh-my-posh.psd1

@@ -1,5 +1,5 @@
 #
-# Module manifest for module 'Oh-My-Powershell'
+# Module manifest for module 'Oh-My-Posh'
 #
 # Generated by: GonzaloP
 #
@@ -9,10 +9,10 @@
 @{
 
 # Script module or binary module file associated with this manifest.
-RootModule = 'oh-my-powershell.psm1'
+RootModule = 'oh-my-posh.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.6'
+ModuleVersion = '0.7'
 
 # ID used to uniquely identify this module
 GUID = '5f403c28-05ed-4be1-ae0a-7fcfab30b4df'
@@ -27,7 +27,7 @@ CompanyName = 'Gonzalo Peci'
 Copyright = 'Copyright (c) 2015 MIT.'
 
 # Description of the functionality provided by this module
-Description = 'Oh-My-Powershell Magic'
+Description = 'Oh-My-Posh Magic'
 
 # Minimum version of the Windows PowerShell engine required by this module
 PowerShellVersion = '4.0'

modules/oh-my-posh/oh-my-posh.psm1

@@ -0,0 +1,17 @@
+# Check if profile exists
+
+If ( Test-Path ("$Env:USERPROFILE\.oh-my-posh.config.ps1") ) {
+    Write-Output "Detected a Oh-My-Posh Profile"
+} else {
+    cp $Env:USERPROFILE"\.oh-my-posh\template\oh-my-posh.config.ps1" $Env:USERPROFILE"\.oh-my-posh.config.ps1"
+}
+
+# Load Profile var
+. $Env:USERPROFILE"\.oh-my-posh.config.ps1"
+
+# Check for updates
+. $Env:USERPROFILE"\.oh-my-posh\tools\check_for_updates.ps1"
+
+# Execute Oh-My-Powershell
+. $Env:USERPROFILE"\.oh-my-posh\oh-my-posh.ps1"
+

modules/oh-my-powershell/oh-my-powershell.psm1

@@ -0,0 +1,15 @@
+# Install modules
+& "$Env:USERPROFILE\.oh-my-posh\tools\modules.ps1"
+
+# Handle Plugins
+foreach ($plugin in $plugins) {
+  Write-Verbose  "Loading from: $Env:USERPROFILE\.oh-my-posh\plugins\$plugin"
+  $files = Get-ChildItem $Env:USERPROFILE\.oh-my-posh\plugins\$plugin -Filter *.ps1
+  foreach ($file in $files) {
+    Write-Verbose  "  Loading file: $($file.FullName)"
+    . $file.FullName
+  }
+}
+
+# Load theme
+. "$Env:USERPROFILE\.oh-my-posh\themes\$theme.ps1"

oh-my-posh.ps1

@@ -1,6 +1,3 @@
-
-
-
 # Credit Adam Driscoll
 # https://github.com/adamdriscoll/PoshInternals/blob/master/PendMoves.ps1
 # This can also be installed by installing the module PoshInternals

oh-my-powershell.ps1

@@ -1,5 +1,5 @@
 ###############################################################################
-# psreadline
+# psreadline configuration
 # http://runas.me/2014/08/28/powershell-console-conemu-psreadline/
 # http://www.reddit.com/r/sysadmin/comments/1rit4l/what_do_you_get_when_you_cross_bash_with_cmdexe/cdo3djk
 ###############################################################################

plugins/file_utils/file_utils.ps1

@@ -1,5 +1,5 @@
 # Clone psutils if its not present
-if (!(Test-Path $PSScriptRoot/psutils)) {
+if (!(Test-Path "$PSScriptRoot\psutils")) {
   Write-Host "Installing psutils"
   git clone https://github.com/lukesampson/psutils $PSScriptRoot/psutils
 }