Skip to content

Commit

Permalink
Fixed setup issues (microsoft#248)
Browse files Browse the repository at this point in the history
* Added rename

* Added rename
  • Loading branch information
nang-dev authored and nang-dev committed Oct 3, 2024
1 parent 1f63fe9 commit b9f0a46
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scripts/pearai/setup-environment.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function Initialize-BaseFunctionality {
Invoke-CMD -Command "git pull origin main" -ErrorMessage "Failed to pull latest changes from origin/main"


$script = Join-Path -Path $modulePath -ChildPath 'scripts\install-dependencies.ps1'
$script = Join-Path -Path $modulePath -ChildPath 'scripts\install-and-build.ps1'
Invoke-CMD -Command "powershell.exe -ExecutionPolicy Bypass -File $script" -ErrorMessage "Failed to install dependencies for the submodule"

# Discard the package.json and package-lock.json version update changes
Expand All @@ -46,7 +46,7 @@ function Initialize-BaseFunctionality {
}

function Create-SymLink {
Write-Host "`nCreating symbolic link 'extensions\pearai-submodule\extensions\vscode' -> 'extensions\pearai-extension'" -ForegroundColor White
Write-Host "`nCreating symbolic link 'extensions\pearai-ref' -> 'extensions\pearai-submodule\extensions\vscode'" -ForegroundColor White
Start-Process powershell.exe -Verb RunAs -ArgumentList ("-ExecutionPolicy Bypass ", "-Command", "powershell.exe -ExecutionPolicy Bypass -File '$createLinkScript' '$targetPath' '$linkPath'")
Start-Sleep 1
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/pearai/setup-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ execute "git fetch origin" "Failed to fetch latest changes from origin"
# Make sure the submodule has the latest updates
execute "git pull origin main" "Failed to pull latest changes from origin/main"

execute "./scripts/install-dependencies.sh" "Failed to install dependencies for the submodule"
execute "./scripts/install-and-build.sh" "Failed to install dependencies for the submodule"

# Discard the package.json and package-lock.json version update changes
execute "git reset --hard" "Failed to reset --hard after submodule dependencies install"
Expand Down

0 comments on commit b9f0a46

Please sign in to comment.