Skip to content

Commit

Permalink
fixed setup.ps1 to work with an external powershell (outside of VScode)
Browse files Browse the repository at this point in the history
  • Loading branch information
ole committed Oct 2, 2017
1 parent eb3ce83 commit 567e1ab
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## AdminToolkit for Arma 3
<sup>**Version 2.0.3** | Author: ole1986 | This work is licensed under a Creative Commons Attribution-NonCommercial 4.0 International License</sup>
<sup>**Version 2.0.4** | Author: ole1986 | This work is licensed under a Creative Commons Attribution-NonCommercial 4.0 International License</sup>

The ATK is used to administrate Arma 3 multiplayer servers and be extended with user extensions

Expand Down
14 changes: 7 additions & 7 deletions setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ if(!(Test-Path $GameFolder)) {

if($Build) {
Write-Host "Building Server PBO"
$ok = Pack-Pbo "source\admintoolkit_server" "@AdminToolkitServer\addons"
$ok = Pack-Pbo "$PWD\source\admintoolkit_server" "$PWD\@AdminToolkitServer\addons"
if(!$ok) { Exit }

Write-Host "Building Server Config PBO"
$ok = Pack-Pbo "source\admintoolkit_servercfg" "@AdminToolkitServer\addons"
$ok = Pack-Pbo "$PWD\source\admintoolkit_servercfg" "$PWD\@AdminToolkitServer\addons"
if(!$ok) { Exit }

Write-Host "Building Client PBO"
$ok = Pack-Pbo "source\admintoolkit" "@AdminToolkit\addons" "admintoolkit.biprivatekey"
$ok = Pack-Pbo "$PWD\source\admintoolkit" "$PWD\@AdminToolkit\addons" "$PWD\admintoolkit.biprivatekey"
if(!$ok) { Exit }

Write-Host -ForegroundColor Green "###################"
Expand All @@ -129,7 +129,7 @@ if($Install) {
Start-Sleep 2

Write-Host -NoNewline "Installing AdminToolkit client into $GameFolder..."
Copy-Item -Recurse .\@AdminToolkit -Destination $GameFolder -Force
Copy-Item -Recurse $PWD\@AdminToolkit -Destination $GameFolder -Force
Write-Host -ForegroundColor Green "DONE"
if($Run) {
Write-Host -NoNewline "Running Arma 3..."
Expand All @@ -140,7 +140,7 @@ if($Install) {

if($PatchMission) {
Write-Host -ForegroundColor Green "Please select your mission file from the dialog:"
$missionFile = Get-FileName($PSScriptRoot)
$missionFile = Get-FileName($PWD)

if(!$missionFile) {
Write-Host "Canceled by user action"
Expand All @@ -161,7 +161,7 @@ if($PatchMission) {
}

Write-Host "Copying mission related files into $extractedPath"
Copy-Item "source\mission_file\*" -Destination "$extractedPath" -Recurse -Force
Copy-Item "$PWD\source\mission_file\*" -Destination "$extractedPath" -Recurse -Force

Write-Host -NoNewline "Trying to patch file $extractedPath\description.ext..."

Expand All @@ -179,7 +179,7 @@ if($PatchMission) {
}

Write-Host "Building mission file '$extractedFolder'..."
if(! (Pack-Pbo "$extractedPath" "@MissionFile")) {
if(! (Pack-Pbo "$extractedPath" "$PWD\@MissionFile")) {
Exit
}

Expand Down

0 comments on commit 567e1ab

Please sign in to comment.