refactor(powershell): use PSDrive path

resolves #329
JanDeDobbeleer · Jan 9, 2021 · 780722a · 780722a
1 parent c7bbed1
commit 780722a
Show file tree

Hide file tree

Showing 5 changed files with 139 additions and 292 deletions.
diff --git a/packages/powershell/oh-my-posh/oh-my-posh.psm1 b/packages/powershell/oh-my-posh/oh-my-posh.psm1
@@ -77,7 +77,8 @@ function Set-PoshPrompt {
         $startInfo.FileName = Get-PoshCommand
         $config = $global:PoshSettings.Theme
         $cleanPWD = $PWD.ProviderPath.TrimEnd("\")
-        $startInfo.Arguments = "--config=""$config"" --error=$errorCode --pwd=""$cleanPWD"" --execution-time=$executionTime"
+        $cleanPSWD = $PWD.ToString().TrimEnd("\")
+        $startInfo.Arguments = "--config=""$config"" --error=$errorCode --pwd=""$cleanPWD"" --pswd=""$cleanPSWD"" --execution-time=$executionTime"
         $startInfo.Environment["TERM"] = "xterm-256color"
         $startInfo.CreateNoWindow = $true
         $startInfo.StandardOutputEncoding = [System.Text.Encoding]::UTF8

diff --git a/src/init/omp.ps1 b/src/init/omp.ps1
@@ -41,7 +41,8 @@ function Set-GitStatus {
     $startInfo.FileName = "::OMP::"
     $config = $global:PoshSettings.Theme
     $cleanPWD = $PWD.ProviderPath.TrimEnd("\")
-    $startInfo.Arguments = "--config=""$config"" --error=$errorCode --pwd=""$cleanPWD"" --execution-time=$executionTime"
+    $cleanPSWD = $PWD.ToString().TrimEnd("\")
+    $startInfo.Arguments = "--config=""$config"" --error=$errorCode --pwd=""$cleanPWD"" --pswd=""$cleanPSWD"" --execution-time=$executionTime"
     $startInfo.Environment["TERM"] = "xterm-256color"
     $startInfo.CreateNoWindow = $true
     $startInfo.StandardOutputEncoding = [System.Text.Encoding]::UTF8

diff --git a/src/main.go b/src/main.go
@@ -30,6 +30,7 @@ type args struct {
 	Config        *string
 	Shell         *string
 	PWD           *string
+	PSWD          *string
 	Version       *bool
 	Debug         *bool
 	ExecutionTime *float64
@@ -65,6 +66,10 @@ func main() {
 			"pwd",
 			"",
 			"the path you are working in"),
+		PSWD: flag.String(
+			"pswd",
+			"",
+			"the powershell path you are working in, useful when working with drives"),
 		Version: flag.Bool(
 			"version",
 			false,
@@ -98,7 +103,6 @@ func main() {
 	env := &environment{
 		args:     args,
 		commands: make(map[string]string),
-		cwd:      *args.PWD,
 	}
 	if *args.Millis {
 		fmt.Print(time.Now().UnixNano() / 1000000)
@@ -131,7 +135,6 @@ func main() {
 
 	formats := &ansiFormats{}
 	formats.init(env.getShellName())
-
 	renderer := &AnsiRenderer{
 		formats: formats,
 	}

diff --git a/src/segment_path.go b/src/segment_path.go
@@ -119,12 +119,13 @@ func (pt *path) getFolderPath() string {
 }
 
 func (pt *path) getPwd() string {
-	pwd := pt.env.getcwd()
-
+	pwd := *pt.env.getArgs().PSWD
+	if pwd == "" {
+		pwd = pt.env.getcwd()
+	}
 	if pt.props.getBool(MappedLocationsEnabled, true) {
 		pwd = pt.replaceMappedLocations(pwd)
 	}
-
 	return pwd
 }