diff --git a/m1/scripts/anr.sh b/m1/scripts/anr.sh index c4973d0a..39fdad83 100755 --- a/m1/scripts/anr.sh +++ b/m1/scripts/anr.sh @@ -14,11 +14,7 @@ export SUBNET_ID=srEXiWaHZNDcVtfHLb38cFiwKVLJ8xnhDF5qpWbYdowxEiyid echo $SUBNET_ID # Copy the subnet binary to the plugin dir -<<<<<<< HEAD -# cp ./target/debug/subnet ${AVALANCHEGO_PLUGIN_PATH}/${SUBNET_ID} -======= cp ./target/debug/subnet ${AVALANCHEGO_PLUGIN_PATH}/${SUBNET_ID} ->>>>>>> indexer-fix # cp ./target/debug/subnet ${AVALANCHEGO_PLUGIN_PATH}/subnet # Start the avalanche-network-runner diff --git a/scripts/install.sh b/scripts/install.sh index 86c8fedf..90481f3a 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -188,9 +188,9 @@ show_config(){ setup() { log_warning "Removing previous installation, if one exists." - rm -rf "$AVALANCHEGO_DIR" "$AVALANCHEGO_DIR/plugins" "$MOVEMENT_DIR" "$PLUGINS_DIR" "$BIN_DIR" "$MOVEMENT_WORKSPACE" + rm -rf "$MOVEMENT_DIR" log_info "Making new .movement directories." - mkdir -p "$AVALANCHEGO_DIR" "$AVALANCHEGO_DIR/plugins" "$MOVEMENT_DIR" "$PLUGINS_DIR" "$BIN_DIR" "$MOVEMENT_WORKSPACE" + mkdir -p "$MOVEMENT_DIR" }