Rename variable to proper one which also fixes a shellcheck warning

makerdao · Sep 7, 2021 · cdae552 · cdae552
1 parent a33c92d
commit cdae552
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/libexec/dss/deploy-core b/libexec/dss/deploy-core
@@ -29,7 +29,7 @@ fi
 MCD_DEPLOY=$(dappCreate dss-deploy-optimized-runs-1 DssDeploy)
 logAddr "MCD_DEPLOY" "$MCD_DEPLOY"
 
-sethSend "$MCD_DEPLOY" "addFabs1(address,address,address,address,address,address,address)" "$VAT_FAB" "$JUG_FAB" "$VOW_FAB" "$CAT_FAB" "$DOG_FAB" "$DAI_FAB" "$MCD_JOIN_FAB"
+sethSend "$MCD_DEPLOY" "addFabs1(address,address,address,address,address,address,address)" "$VAT_FAB" "$JUG_FAB" "$VOW_FAB" "$CAT_FAB" "$DOG_FAB" "$DAI_FAB" "$MCD_JOIN_DAI_FAB"
 sethSend "$MCD_DEPLOY" "addFabs2(address,address,address,address,address,address,address,address,address,address)" "$FLAP_FAB" "$FLOP_FAB" "$FLIP_FAB" "$CLIP_FAB" "$CALC_FAB" "$SPOT_FAB" "$POT_FAB" "$END_FAB" "$ESM_FAB" "$PAUSE_FAB"
 
 # If no Authority is defined, create one

diff --git a/libexec/dss/deploy-fab b/libexec/dss/deploy-fab
@@ -26,7 +26,7 @@ VOW_FABtx=$(dappCreate dss-deploy-1_2 VowFab)
 CAT_FABtx=$(dappCreate dss-deploy-1_2 CatFab)
 DOG_FABtx=$(dappCreate dss-deploy DogFab)
 DAI_FABtx=$(dappCreate dss-deploy-1_2 DaiFab)
-MCD_JOIN_FABtx=$(dappCreate dss-deploy-1_2 DaiJoinFab)
+MCD_JOIN_DAI_FABtx=$(dappCreate dss-deploy-1_2 DaiJoinFab)
 FLAP_FABtx=$(dappCreate dss-deploy-1_2 FlapFab)
 FLOP_FABtx=$(dappCreate dss-deploy-1_2 FlopFab)
 FLIP_FABtx=$(dappCreate dss-deploy-1_2 FlipFab)
@@ -46,7 +46,7 @@ test "$(seth receipt "$VOW_FABtx" status)" -eq 0 && exit 1
 test "$(seth receipt "$CAT_FABtx" status)" -eq 0 && exit 1
 test "$(seth receipt "$DOG_FABtx" status)" -eq 0 && exit 1
 test "$(seth receipt "$DAI_FABtx" status)" -eq 0 && exit 1
-test "$(seth receipt "$MCD_JOIN_FABtx" status)" -eq 0 && exit 1
+test "$(seth receipt "$MCD_JOIN_DAI_FABtx" status)" -eq 0 && exit 1
 test "$(seth receipt "$FLAP_FABtx" status)" -eq 0 && exit 1
 test "$(seth receipt "$FLOP_FABtx" status)" -eq 0 && exit 1
 test "$(seth receipt "$FLIP_FABtx" status)" -eq 0 && exit 1
@@ -64,7 +64,7 @@ VOW_FAB=$(seth receipt "$VOW_FABtx" contractAddress)
 CAT_FAB=$(seth receipt "$CAT_FABtx" contractAddress)
 DOG_FAB=$(seth receipt "$DOG_FABtx" contractAddress)
 DAI_FAB=$(seth receipt "$DAI_FABtx" contractAddress)
-MCD_JOIN_FAB=$(seth receipt "$MCD_JOIN_FABtx" contractAddress)
+MCD_JOIN_DAI_FAB=$(seth receipt "$MCD_JOIN_DAI_FABtx" contractAddress)
 FLAP_FAB=$(seth receipt "$FLAP_FABtx" contractAddress)
 FLOP_FAB=$(seth receipt "$FLOP_FABtx" contractAddress)
 FLIP_FAB=$(seth receipt "$FLIP_FABtx" contractAddress)
@@ -82,7 +82,7 @@ logAddr "VOW_FAB" "$VOW_FAB"
 logAddr "CAT_FAB" "$CAT_FAB"
 logAddr "DOG_FAB" "$DOG_FAB"
 logAddr "DAI_FAB" "$DAI_FAB"
-logAddr "MCD_JOIN_FAB" "$MCD_JOIN_FAB"
+logAddr "MCD_JOIN_DAI_FAB" "$MCD_JOIN_DAI_FAB"
 logAddr "FLAP_FAB" "$FLAP_FAB"
 logAddr "FLOP_FAB" "$FLOP_FAB"
 logAddr "FLIP_FAB" "$FLIP_FAB"
@@ -102,7 +102,7 @@ export VOW_FAB=$VOW_FAB
 export CAT_FAB=$CAT_FAB
 export DOG_FAB=$DOG_FAB
 export DAI_FAB=$DAI_FAB
-export MCD_JOIN_FAB=$MCD_JOIN_FAB
+export MCD_JOIN_DAI_FAB=$MCD_JOIN_DAI_FAB
 export FLAP_FAB=$FLAP_FAB
 export FLOP_FAB=$FLOP_FAB
 export FLIP_FAB=$FLIP_FAB