Merge pull request #89 from okjodom/yarn-nix

fix: yarn nix commands
fedimint · Jul 19, 2023 · de03c95 · de03c95
2 parents 43debed + 9f8760a
commit de03c95
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
     "lint": "turbo run lint",
     "test": "turbo run test",
     "prepare": "husky install",
-    "nix-guardian": "./scripts/mprocs-nix.sh dev-fed mprocs-nix-gateway.yml",
-    "nix-gateway": "./scripts/mprocs-nix.sh run-ui mprocs-nix-gateway.yml",
+    "nix-guardian": "./scripts/mprocs-nix.sh run-ui mprocs-nix-guardian.yml",
+    "nix-gateway": "./scripts/mprocs-nix.sh dev-fed mprocs-nix-gateway.yml",
     "mprocs": "mprocs -c ./mprocs.yml"
   },
   "devDependencies": {

diff --git a/scripts/mprocs-nix.sh b/scripts/mprocs-nix.sh
@@ -13,13 +13,13 @@ export FM_FED_SIZE=4
 export FM_PID_FILE="$FM_TEST_DIR/.pid"
 export FM_LOGS_DIR="$FM_TEST_DIR/logs"
 
-devimint dev-fed 2>/dev/null &
-
 mkdir $FM_TEST_DIR
 mkdir $FM_LOGS_DIR
 touch $FM_PID_FILE
+
+devimint $DEVIMINT_COMMAND 2>/dev/null &
 echo $! >> $FM_PID_FILE
-eval "$(devimint $DEVIMINT_COMMAND)"
+
 
 # Function for killing processes stored in FM_PID_FILE in reverse-order they were created in
 function kill_fedimint_processes {