Merge branch 'master' of https://github.com/MaynardMiner/SWARM into b…

…eta2
MaynardMiner · MaynardMiner · Mar 8, 2020 · Feb 24, 2020 · Feb 24, 2020 · Feb 25, 2020
commit a13dc13ae36f3b25deafd82fd64c2a842860948b
diff --git a/build/powershell/build/poolbans.psm1 b/build/powershell/build/poolbans.psm1
@@ -67,7 +67,7 @@ Function Global:Get-SpecialParams {
     $(arg).Passwordcurrency2 = @("BTC")
     $(arg).Passwordcurrency3 = @("BTC")
     $(vars).DCheck = $true
-    $(vars).DWallet = @($BanPass1, $BanPass3, "$($BanPass3).Donate_$number", "$($BanPass1).Donate_$number")
+    $(vars).DWallet = @($BanPass1,"$($BanPass3).Donate_$number", "$($BanPass1).Donate_$number", $BanPass3)
     if ( "nicehash" -in $global:Config.user_params.PoolName -and $global:Config.user_params.PoolName.count -eq 1) {
         $(arg).PoolName = @("nicehash")
     }

diff --git a/build/powershell/control/launchcode.psm1 b/build/powershell/control/launchcode.psm1
@@ -561,9 +561,35 @@ function Global:Start-LaunchCode($MinerCurrent, $AIP) {
             ## A screen should have started that is titled the name of the Type
             ## of the device. We must identify the process id. We so this with
             ## a simple parsing of screen list.
-            ## I use bash to parse, becuase for some reason I can't get whitespace 
-            ## removed with pwsh-preview from screen list using String.replace
-            [int]$Screen_ID = invoke-expression "screen -ls | grep $($MinerCurrent.Type) | cut -f1 -d'.' | sed 's/\W//g'"
+            $Get_Screen = @()
+            $info = [System.Diagnostics.ProcessStartInfo]::new()
+            $info.FileName = "screen"
+            $info.Arguments = "-ls $($MinerCurrent.Type)"
+            $info.UseShellExecute = $false
+            $info.RedirectStandardOutput = $true
+            $info.Verb = "runas"
+            $Proc = [System.Diagnostics.Process]::New()
+            $proc.StartInfo = $Info
+            $timer = [System.Diagnostics.Stopwatch]::New()
+            $timer.Restart();
+            $proc.Start() | Out-Null
+            while (-not $Proc.StandardOutput.EndOfStream) {
+                $Get_Screen += $Proc.StandardOutput.ReadLine();
+                if ($timer.Elapsed.Seconds -gt 15) {
+                    $proc.kill() | Out-Null;
+                    break;
+                }
+            }
+            $Proc.Dispose();            
+
+            ## User showed an error that there was no miner screen, and I don't know why.
+            ## Make an error generate if there is not a screen that matches current type
+            if ($Get_Screen -like "*$($MinerCurrent.Type)") {
+                [int]$Screen_ID = $($Get_Screen | Select-String $MinerCurrent.Type).ToString().Split('.')[0].Replace("`t", "")
+            }
+            else {
+                log "Warning- There was no screen that matches $($MinerCurrent.Type)" -Foreground Red
+            }
 
             ## Now that we have a list of all Process with the name of the exectuable.
             ## We used bash to launch the miner, so the parent of the core process