diff --git a/bat/install.ps1 b/bat/install.ps1 index 9bedb16..c376336 100644 --- a/bat/install.ps1 +++ b/bat/install.ps1 @@ -15,7 +15,7 @@ IF (-not (Test-Path "\Windows\System32\vcruntime140.dll")) { & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" vcruntime } -IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { +IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) { Write-Output "Installing $Env:PKG_NAME" # TODO: temp directory @@ -36,7 +36,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { # Settle unpacked archive into place Write-Output "New Name: $VERNAME" Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME" - Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin" + Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\bin" # Exit tmp Pop-Location @@ -44,4 +44,4 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'" Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore -Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse +Copy-Item -Path "$Env:USERPROFILE\.local\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse diff --git a/curlie/install.ps1 b/curlie/install.ps1 index d15a37a..04538e5 100644 --- a/curlie/install.ps1 +++ b/curlie/install.ps1 @@ -9,7 +9,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) { & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" } -IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { +IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) { Write-Output "Installing $Env:PKG_NAME" # TODO: temp directory @@ -30,7 +30,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { # Settle unpacked archive into place Write-Output "New Name: $VERNAME" Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME" - Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin" + Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\bin" # Exit tmp Pop-Location @@ -38,4 +38,4 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'" Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore -Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse +Copy-Item -Path "$Env:USERPROFILE\.local\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse diff --git a/fd/install.ps1 b/fd/install.ps1 index d15a37a..04538e5 100644 --- a/fd/install.ps1 +++ b/fd/install.ps1 @@ -9,7 +9,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) { & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" } -IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { +IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) { Write-Output "Installing $Env:PKG_NAME" # TODO: temp directory @@ -30,7 +30,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { # Settle unpacked archive into place Write-Output "New Name: $VERNAME" Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME" - Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin" + Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\bin" # Exit tmp Pop-Location @@ -38,4 +38,4 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'" Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore -Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse +Copy-Item -Path "$Env:USERPROFILE\.local\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse diff --git a/fzf/install.ps1 b/fzf/install.ps1 index d15a37a..04538e5 100644 --- a/fzf/install.ps1 +++ b/fzf/install.ps1 @@ -9,7 +9,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) { & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" } -IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { +IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) { Write-Output "Installing $Env:PKG_NAME" # TODO: temp directory @@ -30,7 +30,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { # Settle unpacked archive into place Write-Output "New Name: $VERNAME" Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME" - Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin" + Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\bin" # Exit tmp Pop-Location @@ -38,4 +38,4 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'" Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore -Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse +Copy-Item -Path "$Env:USERPROFILE\.local\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse diff --git a/jq/install.ps1 b/jq/install.ps1 index 19d65c5..2dd4285 100644 --- a/jq/install.ps1 +++ b/jq/install.ps1 @@ -9,7 +9,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) { & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" } -IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { +IF (!(Test-Path -Path "$Env:USERPROFILE\.local\bin\$VERNAME")) { Write-Output "Installing $Env:PKG_NAME" # TODO: temp directory @@ -27,7 +27,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { Write-Output "New Name: $VERNAME" Get-ChildItem "$Env:PKG_NAME-v*" | Select-Object -f 1 | Rename-Item -NewName "$VERNAME" Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME" - Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin" + Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\bin" # Exit tmp Pop-Location @@ -35,4 +35,4 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) { Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'" Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore -Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse +Copy-Item -Path "$Env:USERPROFILE\.local\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse diff --git a/webi/webi-pwsh.ps1 b/webi/webi-pwsh.ps1 index 48548c1..52b8f59 100644 --- a/webi/webi-pwsh.ps1 +++ b/webi/webi-pwsh.ps1 @@ -35,9 +35,8 @@ $exename = $args[0] Push-Location $Env:USERPROFILE # Make paths if needed -New-Item -Path .local\bin -ItemType Directory -Force | Out-Null # TODO replace all xbin with opt\bin\ -New-Item -Path .local\xbin -ItemType Directory -Force | Out-Null +New-Item -Path .local\bin -ItemType Directory -Force | Out-Null # See note on Set-ExecutionPolicy above Set-Content -Path .local\bin\webi.bat -Value "@echo off`r`npushd %USERPROFILE%`r`npowershell -ExecutionPolicy Bypass .local\bin\webi-pwsh.ps1 %1`r`npopd"