test1

MaynardMiner · May 21, 2019 · 0c9b1d2 · 0c9b1d2
1 parent 057576a
commit 0c9b1d2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/h-run.sh b/h-run.sh
@@ -40,4 +40,9 @@ sudo ln -s /opt/microsoft/powershell/6.1.0/pwsh /usr/bin/pwsh
 sudo rm -rf /tmp/powershell.tar.gz
 fi
 
-pwsh -command "&.\startup.ps1 $(< /hive/miners/custom/$CUSTOM_NAME/$CUSTOM_NAME.conf)" $@
+if jq -e . >/dev/null 2>&1 <<<"$@"; then
+  $@ > $PWD/config.json
+  pwsh -command "& .\startup.ps1"
+  else
+  pwsh -command "&.\startup.ps1 $(< /hive/miners/custom/$CUSTOM_NAME/$CUSTOM_NAME.conf)" $@
+fi
diff --git a/startup.ps1 b/startup.ps1
@@ -12,7 +12,7 @@ if (Test-Path ".\config\parameters\default.json") {
 }
 
 $List = $Defaults.PSObject.Properties.Name
-$global:parsed = @{ }
+$parsed = @{ }
 
 if ($args) {
     $args | % {
@@ -39,9 +39,13 @@ if ($args) {
             }
         }
     }
+} elseif (test-path ".\config.json") {
+    $parsed = @{ }
+    $arguments = Get-Content ".\config.json" | ConvertFrom-Json
+    $arguments.PSObject.Properties.Name | % { $Parsed.Add("$($_)", $arguments.$_) }
 } elseif (Test-Path ".\config\parameters\arguments.json") {
-    $global:parsed = @{ }
-    $arguments = Get-Content ".\config\parameters\arguments.json" ConvertFrom-Json
+    $parsed = @{ }
+    $arguments = Get-Content ".\config\parameters\arguments.json" | ConvertFrom-Json
     $arguments.PSObject.Properties.Name | % { $Parsed.Add("$($_)", $arguments.$_) }
 } else {
     Write-Host "No Arguments or arguments.json file found. Exiting."