diff --git a/bin/auto-pr.ps1 b/bin/auto-pr.ps1 index e01544cdae..14c107e1b4 100644 --- a/bin/auto-pr.ps1 +++ b/bin/auto-pr.ps1 @@ -5,5 +5,5 @@ param( if(!$env:SCOOP_HOME) { $env:SCOOP_HOME = Resolve-Path (scoop prefix scoop) } $autopr = "$env:SCOOP_HOME/bin/auto-pr.ps1" -$dir = "$psscriptroot/../bucket" # checks the parent dir +$dir = "$PSScriptRoot/../bucket" # checks the parent dir Invoke-Expression -command "& '$autopr' -dir '$dir' -upstream $upstream $($args | ForEach-Object { "$_ " })" diff --git a/bin/checkurls.ps1 b/bin/checkurls.ps1 index 8d2ca12126..cfe5e7d603 100644 --- a/bin/checkurls.ps1 +++ b/bin/checkurls.ps1 @@ -1,4 +1,4 @@ if(!$env:SCOOP_HOME) { $env:SCOOP_HOME = Resolve-Path (scoop prefix scoop) } $checkurls = "$env:SCOOP_HOME/bin/checkurls.ps1" -$dir = "$psscriptroot/../bucket" # checks the parent dir +$dir = "$PSScriptRoot/../bucket" # checks the parent dir Invoke-Expression -command "& '$checkurls' -dir '$dir' $($args | ForEach-Object { "$_ " })" diff --git a/bin/checkver.ps1 b/bin/checkver.ps1 index fe8942d28c..6f6b53a054 100644 --- a/bin/checkver.ps1 +++ b/bin/checkver.ps1 @@ -1,4 +1,4 @@ if(!$env:SCOOP_HOME) { $env:SCOOP_HOME = Resolve-Path (scoop prefix scoop) } $checkver = "$env:SCOOP_HOME/bin/checkver.ps1" -$dir = "$psscriptroot/../bucket" # checks the parent dir +$dir = "$PSScriptRoot/../bucket" # checks the parent dir Invoke-Expression -command "& '$checkver' -dir '$dir' $($args | ForEach-Object { "$_ " })" diff --git a/bin/formatjson.ps1 b/bin/formatjson.ps1 index 4fe306de11..188458310f 100644 --- a/bin/formatjson.ps1 +++ b/bin/formatjson.ps1 @@ -1,4 +1,4 @@ if(!$env:SCOOP_HOME) { $env:SCOOP_HOME = Resolve-Path (scoop prefix scoop) } $formatjson = "$env:SCOOP_HOME/bin/formatjson.ps1" -$path = "$psscriptroot/../bucket" # checks the parent dir +$path = "$PSScriptRoot/../bucket" # checks the parent dir Invoke-Expression -command "& '$formatjson' -dir '$path' $($args | ForEach-Object { "$_ " })" diff --git a/bin/missing-checkver.ps1 b/bin/missing-checkver.ps1 index 8c030662ba..bca8abb073 100644 --- a/bin/missing-checkver.ps1 +++ b/bin/missing-checkver.ps1 @@ -1,4 +1,4 @@ if(!$env:SCOOP_HOME) { $env:SCOOP_HOME = Resolve-Path (scoop prefix scoop) } $missing_checkver = "$env:SCOOP_HOME/bin/missing-checkver.ps1" -$dir = "$psscriptroot/../bucket" # checks the parent dir +$dir = "$PSScriptRoot/../bucket" # checks the parent dir Invoke-Expression -command "& '$missing_checkver' -dir '$dir' $($args | ForEach-Object { "$_ " })" diff --git a/bucket/composer.json b/bucket/composer.json index 71351d6bf0..45fd11603a 100644 --- a/bucket/composer.json +++ b/bucket/composer.json @@ -15,7 +15,7 @@ "pre_install": [ "@(", " 'if ($args.length -eq 1 -and ($args -eq \"selfupdate\" -or $args -eq \"self-update\")) { & scoop update composer }'", - " 'else { & php (Join-Path $psscriptroot \"composer.phar\") @args }'", + " 'else { & php (Join-Path $PSScriptRoot \"composer.phar\") @args }'", ") | Add-Content -Path \"$dir\\composer.ps1\"", "if (!(Test-Path \"$persist_dir\\home\") -and (Test-Path \"$env:Appdata\\Composer\")) {", " Write-Host -F yellow \"Moving old 'COMPOSER_HOME' to '$persist_dir\\home'\"", diff --git a/bucket/wp-cli.json b/bucket/wp-cli.json index ca8c3a42ad..2bd9765433 100644 --- a/bucket/wp-cli.json +++ b/bucket/wp-cli.json @@ -14,7 +14,7 @@ "hash": "sha512:d73f9161a1f03b8ecaac7b196b6051fe847b3c402b9c92b1f6f3acbe5b1cf91f7260c0e499b8947bab75920ecec918b39533ca65fa5a1fd3eb6ce7b8e2c58e7d", "pre_install": [ "echo 'if($args.length -eq 2 -and ($args[0] -eq \"cli\" -and $args[1] -eq \"update\")) { & scoop update wp-cli }' | out-file \"$dir\\wp.ps1\"", - "echo 'else { & php (join-path $psscriptroot \"wp-cli.phar\") @args }' | out-file \"$dir\\wp.ps1\" -append" + "echo 'else { & php (join-path $PSScriptRoot \"wp-cli.phar\") @args }' | out-file \"$dir\\wp.ps1\" -append" ], "bin": "wp.ps1", "checkver": {