Skip to content

Commit

Permalink
fix typo in swarm_help saving arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
MaynardMiner committed Jun 28, 2019
1 parent 75c78ce commit 29c4f6d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build/bash/swarm_help
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
#along with this program. If not, see <http://www.gnu.org/licenses/>.

mydir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
pwsh -command "$(< $mydir/dir.sh)/help.ps1"
pwsh -command "$(< $mydir/dir.sh)/build/powershell/scripts/help.ps1"
2 changes: 1 addition & 1 deletion build/cmd/swarm_help.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off
pushd %~dp0
set /p CMDDIR=<dir.txt
pwsh -ExecutionPolicy Bypass -command "set-location ""%CMDDIR%""; .\help.ps1"
pwsh -ExecutionPolicy Bypass -command "set-location ""%CMDDIR%""; .\build\powershell\scripts\help.ps1"
6 changes: 3 additions & 3 deletions help.ps1 → build/powershell/scripts/help.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Start-Sleep -S 3
Clear-Host
$DoBasic = $true

if (Test-Path ".\config\parameters\newargumentss.json") {
if (Test-Path ".\config\parameters\newarguments.json") {
do {
Clear-Host
$ans = Read-Host -Prompt "It seems you have previous configs saved.
Expand Down Expand Up @@ -717,9 +717,9 @@ do {
Write-Host "Saving Settings"
$Defaults = Get-Content ".\config\parameters\default.json" | ConvertFrom-Json
$Defaults.PSObject.Properties.Name | % { if ($_ -notin $(vars).config.keys) { $(vars).config.Add("$($_)", $Defaults.$_) } }
$(vars).config | ConvertTo-Json | Set-Content ".\config\parameters\newargumentss.json"
$(vars).config | ConvertTo-Json | Set-Content ".\config\parameters\newarguments.json"
Start-Sleep -S 2
Write-Host "Settings Saved to `".\config\parameter\newargumentss.json`" ! You can Run SWARM.bat (windows) or ./swarm (linux as root) to start SWARM!"
Write-Host "Settings Saved to `".\config\parameter\newarguments.json`" ! You can Run SWARM.bat (windows) or ./swarm (linux as root) to start SWARM!"
}
if ($Confirm -eq "2") {
do {
Expand Down
2 changes: 1 addition & 1 deletion startup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if ($args) {
if ( "-help" -in $args ) {
if ($IsWindows) {
$host.ui.RawUI.WindowTitle = "SWARM";
Start-Process "CMD" -ArgumentList "/C `"pwsh -noexit -executionpolicy Bypass -WindowStyle Maximized -command `"Set-Location C:\; Set-Location `'$Dir`'; .\help.ps1`"`"" -Verb RunAs
Start-Process "CMD" -ArgumentList "/C `"pwsh -noexit -executionpolicy Bypass -WindowStyle Maximized -command `"Set-Location C:\; Set-Location `'$Dir`'; .\build\powershell\scripts\help.ps1`"`"" -Verb RunAs
}
else {
Invoke-Expression ".\help.ps1"
Expand Down

0 comments on commit 29c4f6d

Please sign in to comment.