lyra2re to lyra2z , lyra2rev3 to lyra2v3

MaynardMiner · May 23, 2019 · 5a46264 · 5a46264
1 parent 97a86f3
commit 5a46264
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/build/powershell/background.ps1 b/build/powershell/background.ps1
@@ -25,6 +25,10 @@ try { if( -not ( $Net | Where {$_.DisplayName -like "*background.ps1*"} ) ) { Ne
 }
 $Net = $null
 
+##Get hive naming conventions:
+$GetHiveNames = ".\config\pools\pool-algos.json"
+$HiveNames = if (Test-Path $GetHiveNames) { Get-Content $GetHiveNames | ConvertFrom-Json }
+
 ## Get Parameters
 $Global:config = [hashtable]::Synchronized(@{ })
 $Global:stats = [hashtable]::Synchronized(@{ })
@@ -78,7 +82,7 @@ Write-Host "Platform is $($global:Config.Params.Platform)"; Write-Host "HiveOS I
 
 ##Icon for windows
 if ($global:Config.Params.Platform -eq "windows") {
-    Start-Process "powershell" -ArgumentList "-command .\build\powershell\icon.ps1 `".\build\apps\comb.ico`"" -NoNewWindow
+    . .\build\powershell\icon.ps1 '.\build\apps\comb.ico'
     $Host.UI.RawUI.BackgroundColor = ($bckgrnd = 'Black'); $Host.UI.RawUI.ForegroundColor = 'White';
     $Host.PrivateData.ErrorForegroundColor = 'Red'; $Host.PrivateData.ErrorBackgroundColor = $bckgrnd;
     $Host.PrivateData.WarningForegroundColor = 'Magenta'; $Host.PrivateData.WarningBackgroundColor = $bckgrnd;
@@ -107,7 +111,7 @@ $Hive_Path = "/hive/bin"
 Write-Host "API Port is $($global:Config.Params.Port)";
 
 if($Global:config.Params.API -eq "Yes") {
-$Posh_api = Get-APIServer;  
+$Posh_api = Get-AP44444444444444444IServer;  
 $Posh_Api.BeginInvoke() | Out-Null
 $Posh_api = $null
 }
@@ -136,10 +140,6 @@ $BackgroundTimer = New-Object -TypeName System.Diagnostics.Stopwatch
 $BackgroundTimer.Restart()
 $RestartTimer = New-Object -TypeName System.Diagnostics.Stopwatch
 
-##Get hive naming conventions:
-$GetHiveNames = ".\config\pools\pool-algos.json"
-$HiveNames = if (Test-Path $GetHiveNames) { Get-Content $GetHiveNames | ConvertFrom-Json }
-
 While ($True) {
 
     ## Timer For When To Restart Loop

diff --git a/build/powershell/launchcode.ps1 b/build/powershell/launchcode.ps1
@@ -199,7 +199,7 @@ function Start-LaunchCode {
                         $script += "New-NetFirewallRule -DisplayName `'$($MinerCurrent.Minername)`' -Direction Inbound -Program `'$Program`' -Action Allow"
                     }
                 }
-                $script += "Start-Process `"powershell`" -ArgumentList `"-command `"`"Set-Location ```'$($global:Dir)```'; & ```'$($global:Dir)\build\powershell\icon.ps1```' ```'$($global:Dir)\build\apps\miner.ico```'`"`"`" -NoNewWindow"
+                $script += ". `'$($global:Dir)\build\powershell\icon.ps1`' `'$($global:Dir)\build\apps\miner.ico`'"
                 $script += "`$host.ui.RawUI.WindowTitle = `'$($MinerCurrent.Name) - $($MinerCurrent.Algo)`';"
                 $MinerCurrent.Prestart | ForEach-Object {
                     if ($_ -notlike "export LD_LIBRARY_PATH=$($global:Dir)\build\export") {

diff --git a/config/pools/pool-algos.json b/config/pools/pool-algos.json
@@ -429,7 +429,7 @@
             "comma seperated"
         ]
     },
-    "lyra2re": {
+    "lyra2z": {
         "alt_names": [
             "lyra2re",
             "lyra2z"
@@ -449,7 +449,7 @@
             "comma seperated"
         ]
     },
-    "lyra2rev3": {
+    "lyra2v3": {
         "alt_names": [
             "lyra2v3",
             "lyra2rev3"

diff --git a/startup.ps1 b/startup.ps1
@@ -58,7 +58,8 @@ $Defaults.PSObject.Properties.Name | % { if ($_ -notin $Parsed.keys) { $Parsed.A
 $Parsed | convertto-json | Out-File ".\config\parameters\arguments.json"
 
 if(Test-path "C:\") {
-    Start-Process "CMD" -ArgumentList "/C powershell -noexit -executionpolicy Bypass -windowstyle maximized -command `"pwsh -command `"Set-Location C:\; Set-Location `'$Dir`'; .\swarm.ps1`"`"" -Verb RunAs
+    $host.ui.RawUI.WindowTitle = "SWARM";
+    Start-Process "CMD" -ArgumentList "/C powershell -noexit -executionpolicy Bypass -windowstyle maximized -command `"pwsh -command `"Set-Location C:\; Set-Location `'$Dir`'; . `'$Dir\build\powershell\icon.ps1`' `'$Dir\build\apps\SWARM.ico`'; .\swarm.ps1`"`"" -Verb RunAs
 }
 else {
     Invoke-Expression ".\swarm.ps1"

diff --git a/swarm.ps1 b/swarm.ps1
@@ -110,7 +110,6 @@ $PID | Out-File ".\build\pid\miner_pid.txt"
 ## Change console icon and title
 if ($global:Config.Params.Platform -eq "windows") {
     $host.ui.RawUI.WindowTitle = "SWARM";
-    Start-Process "powershell" -ArgumentList "-command .\build\powershell\icon.ps1 `".\build\apps\SWARM.ico`"" -NoNewWindow
 }
 
 ##Clear Old Agent Stats