diff --git a/go.mod b/go.mod index 6db6dd34b..fe297cdf7 100644 --- a/go.mod +++ b/go.mod @@ -48,5 +48,3 @@ require ( google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) - -//replace github.com/c4dt/dela-apps => ../dela-apps diff --git a/scripts/local_forms.sh b/scripts/local_forms.sh index ad29d77b3..abeea5a72 100755 --- a/scripts/local_forms.sh +++ b/scripts/local_forms.sh @@ -25,8 +25,8 @@ echo "Form with ID $FORMID has been set up" echo "Adding $SCIPER_ADMIN to voters" tmpfile=$(mktemp) -echo -n "$SCIPER_ADMIN" > "$tmpfile" -(cd web/backend && npx ts-node src/cli.ts addVoters --election-id $FORMID --scipers-file "$tmpfile" ) +echo -n "$SCIPER_ADMIN" >"$tmpfile" +(cd web/backend && npx ts-node src/cli.ts addVoters --election-id $FORMID --scipers-file "$tmpfile") echo "Restarting backend to take into account voters" "$SCRIPT_DIR/run_local.sh" backend . "$SCRIPT_DIR/local_login.sh" diff --git a/scripts/local_login.sh b/scripts/local_login.sh index 6ab1435a8..415194126 100755 --- a/scripts/local_login.sh +++ b/scripts/local_login.sh @@ -1,4 +1,4 @@ -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) . "$SCRIPT_DIR/local_vars.sh" if ! [[ -f cookies.txt ]]; then diff --git a/scripts/local_proxies.sh b/scripts/local_proxies.sh index 12d78b298..093a2b9d6 100755 --- a/scripts/local_proxies.sh +++ b/scripts/local_proxies.sh @@ -1,9 +1,9 @@ #!/bin/bash -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) . "$SCRIPT_DIR/local_login.sh" -echo "adding proxies"; +echo "adding proxies" for node in $( seq 0 3 ); do NodeAddr="localhost:$(( 2000 + node * 2))" diff --git a/scripts/run_local.sh b/scripts/run_local.sh index 529315bb3..e43b8bcde 100755 --- a/scripts/run_local.sh +++ b/scripts/run_local.sh @@ -11,7 +11,7 @@ if [[ $(git rev-parse --show-toplevel) != $(pwd) ]]; then exit 1 fi -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) . "$SCRIPT_DIR/local_vars.sh" asdf_shell() { @@ -26,13 +26,10 @@ mkdir -p nodes function build_dela() { echo "Building dela-node" - if ! [[ -d dela/ ]]; then - git clone https://github.com/c4dt/dela.git - fi export GOBIN=$(pwd)/bin PATH="$PATH":"$GOBIN" if ! [[ -f $GOBIN/crypto ]]; then - (cd dela/cli/crypto && go install) + go install github.com/c4dt/dela/cli/crypto fi if ! [[ -f $GOBIN/dvoting ]]; then go install ./cli/dvoting @@ -60,6 +57,7 @@ function keypair() { function kill_nodes() { pkill dvoting || true + sleep 1 rm -rf nodes/node* }