From ef920fbb7dbfb024c5e96251a943275b58cf29af Mon Sep 17 00:00:00 2001 From: lksz Date: Fri, 2 Oct 2020 14:01:29 -0400 Subject: [PATCH] Fixed /home/szmedia/.local/share/powershell/Scripts assignment --- Setup-Profile.ps1 | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Setup-Profile.ps1 b/Setup-Profile.ps1 index fcfb59f..06d3865 100644 --- a/Setup-Profile.ps1 +++ b/Setup-Profile.ps1 @@ -397,24 +397,19 @@ Write-Verbose $(Get-Item $MyPSModulePath | Select-Object -ExpandProperty FullNam # Establish local/personal Script Root and make sure it's in $env:Path $local:p = Split-PathEnv $env:PATH -$MyPSScriptRoot = Join-Path (Split-Path -Parent $MyPSModulePath) Scripts -Write-Verbose "MyPSScriptRoot = $MyPSScriptRoot" -if ( -not (Test-Path $MyPSScriptRoot) ) { - New-Item -ItemType Directory -Path $MyPSScriptRoot -Force | Out-Null - New-Item -ItemType Directory -Path $MyPSScriptRoot/profile.d -Force | Out-Null +$local:My_PSScriptRoot = Join-Path (Split-Path -Parent $MyPSModulePath) Scripts +Write-Verbose "MyPSScriptRoot = $My_PSScriptRoot" +if ( -not (Test-Path $My_PSScriptRoot) ) { + New-Item -ItemType Directory -Path $My_PSScriptRoot -Force | Out-Null + New-Item -ItemType Directory -Path $My_PSScriptRoot/profile.d -Force | Out-Null } -$global:MyPSScriptRoot = $MyPSScriptRoot +$global:MyPSScriptRoot = $My_PSScriptRoot $p = @($p[0], $MyPSScriptRoot) + $($p | Select-Object -Skip 1) $env:PATH = $p -join $PathEnvDelimiter } -$local:importExpression = "" -if ( -not $MyPSScriptRoot -or (Test-Path function:Test-IsAdmin, function:ConvertTo-Base64, function:Invoke-ExpressionEx, function:Get-PowerShellPath, function:Export-FunctionSource | Where-Object { -not $_ } | Measure-Object | Select-Object -ExpandProperty Count) ) { - Write-Verbose "Calling ProfileCode inline..." - $importExpression = "ProfileCode_common" -} -. Invoke-Expression $importExpression +. ProfileCode_common $SetupFromWeb = [bool]$(@( $SetupFromWeb, $sfw, $LoadCode ) | Where-Object { $_ })