Skip to content

Commit 061ba31

Browse files
yorickdowneyorickdowne
authored
Handle dir with UPPER chars (#2010)
1 parent 20a8679 commit 061ba31

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎ethd‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -465,12 +465,12 @@ __display_docker_dir() {
465465

466466
__display_docker_volumes() {
467467
echo
468-
if [ -z "$(__dodocker volume ls -q -f "name=^$(basename "$(realpath .)")_[^_]+")" ]; then
468+
if [ -z "$(__dodocker volume ls -q -f "name=^$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_[^_]+")" ]; then
469469
echo "There are no Docker volumes for this copy of ${__project_name}"
470470
echo
471471
else
472472
echo "Here are the Docker volumes used by this copy of ${__project_name} and their space usage:"
473-
__dodocker system df -v | grep -A 500 "VOLUME NAME" | grep "^$(basename "$(dirname "$(realpath "${BASH_SOURCE[0]}")")")"
473+
__dodocker system df -v | grep -A 500 "VOLUME NAME" | grep -i "^$(basename "$(dirname "$(realpath "${BASH_SOURCE[0]}")")")"
474474
echo
475475
echo "If your Consensus Layer client takes more than 300 GiB, you can resync it with"
476476
echo "\"${__me} resync-consensus\"."
@@ -712,7 +712,7 @@ __ssv_switch() {
712712
echo "Stopping SSV Node container"
713713
__node=$(__dodocker ps --format '{{.Names}}' | grep 'ssv2-node')
714714
__dodocker stop "${__node}" && __dodocker rm -f "${__node}"
715-
__dodocker volume rm "$(__dodocker volume ls -q | grep "$(basename "$(realpath .)")"_ssv2-data)"
715+
__dodocker volume rm "$(__dodocker volume ls -q | grep -i "$(basename "$(realpath .)")"_ssv2-data)"
716716
echo
717717
echo "SSV Node stopped and database deleted."
718718
echo
@@ -778,19 +778,19 @@ __delete_reth() {
778778
return 0
779779
fi
780780

781-
if [ -z "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)")[_-]reth-el-data")" ]; then # No Reth volume
781+
if [ -z "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')[_-]reth-el-data")" ]; then # No Reth volume
782782
return 0
783783
fi
784784

785785
# Has db been initialized?
786-
__db_exists=$(__dodocker run --rm -v "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)")[_-]reth-el-data")":"/var/lib/reth" \
786+
__db_exists=$(__dodocker run --rm -v "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')[_-]reth-el-data")":"/var/lib/reth" \
787787
alpine:3 sh -c 'if [ -f "/var/lib/reth/db/database.version" ]; then echo true; else echo false; fi')
788788
if [ "$__db_exists" = "false" ]; then
789789
return 0
790790
fi
791791

792792
# Check Reth db version
793-
__db_version="$(__dodocker run --rm -v "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)")[_-]reth-el-data")":"/var/lib/reth" \
793+
__db_version="$(__dodocker run --rm -v "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')[_-]reth-el-data")":"/var/lib/reth" \
794794
alpine:3 cat /var/lib/reth/db/database.version)"
795795
if [ "${__db_version}" -ne "1" ]; then
796796
return 0
@@ -810,7 +810,7 @@ __delete_reth() {
810810

811811
echo "Stopping Reth container"
812812
__docompose stop execution && __docompose rm -f execution
813-
__dodocker volume rm "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)")[_-]reth-el-data")"
813+
__dodocker volume rm "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')[_-]reth-el-data")"
814814
echo
815815
echo "Reth stopped and database deleted."
816816
echo
@@ -838,12 +838,12 @@ __delete_erigon() {
838838
return 0
839839
fi
840840

841-
if [ -z "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)")[_-]erigon-el-data")" ]; then # No Erigon volume
841+
if [ -z "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')[_-]erigon-el-data")" ]; then # No Erigon volume
842842
return 0
843843
fi
844844

845845
# Detect Erigon v3 by directory caplin/latest
846-
__erigon_v3=$(__dodocker run --rm -v "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)")[_-]erigon-el-data")":"/var/lib/erigon" \
846+
__erigon_v3=$(__dodocker run --rm -v "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')[_-]erigon-el-data")":"/var/lib/erigon" \
847847
alpine:3 sh -c 'if [ -d "/var/lib/erigon/caplin/latest" ]; then echo true; else echo false; fi')
848848
if [ "$__erigon_v3" = "true" ]; then
849849
return 0
@@ -861,7 +861,7 @@ __delete_erigon() {
861861

862862
echo "Stopping Erigon container"
863863
__docompose stop execution && __docompose rm -f execution
864-
__dodocker volume rm "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)")[_-]erigon-el-data")"
864+
__dodocker volume rm "$(__dodocker volume ls -q -f "name=$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')[_-]erigon-el-data")"
865865
echo
866866
echo "Erigon stopped and database deleted."
867867
echo
@@ -878,7 +878,7 @@ __upgrade_postgres() {
878878
return 0
879879
fi
880880

881-
__source_vol="$(basename "$(pwd)")_web3signer-slashing-data"
881+
__source_vol="$(basename "$(pwd)" | tr '[:upper:]' '[:lower:]')_web3signer-slashing-data"
882882
if [ -z "$(__dodocker volume ls -q -f "name=${__source_vol}")" ]; then
883883
return 0
884884
fi
@@ -926,8 +926,8 @@ __upgrade_postgres() {
926926
return
927927
fi
928928

929-
__migrated_vol="$(basename "$(pwd)")_web3signer-slashing-data-pg${__target_pg}-migrated"
930-
__backup_vol="$(basename "$(pwd)")_web3signer-slashing-data-pg${__source_pg}-backup"
929+
__migrated_vol="$(basename "$(pwd)" | tr '[:upper:]' '[:lower:]')_web3signer-slashing-data-pg${__target_pg}-migrated"
930+
__backup_vol="$(basename "$(pwd)" | tr '[:upper:]' '[:lower:]')_web3signer-slashing-data-pg${__source_pg}-backup"
931931

932932
echo "Stopping Web3signer"
933933
__docompose stop web3signer && __docompose rm -f web3signer
@@ -1648,7 +1648,7 @@ resync-execution() {
16481648
* ) echo "You do not appear to be running an execution layer client. Nothing to do."; return 0;;
16491649
esac
16501650

1651-
if ! __dodocker volume ls -q | grep -q "$(basename "$(realpath .)")[_-]${__el_volume}"; then
1651+
if ! __dodocker volume ls -q | grep -qi "$(basename "$(realpath .)")[_-]${__el_volume}"; then
16521652
echo "Did not find Docker volume for ${__el_client}. Nothing to do."
16531653
return 0
16541654
fi
@@ -1660,19 +1660,19 @@ resync-execution() {
16601660
* ) echo "Aborting."; exit 130;;
16611661
esac
16621662

1663-
__el_volume="$(basename "$(realpath .)")_${__el_volume}"
1663+
__el_volume="$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_${__el_volume}"
16641664
echo "Stopping ${__el_client} container"
16651665
__docompose stop execution && __docompose rm -f execution
16661666
__dodocker volume rm "$(__dodocker volume ls -q -f "name=${__el_volume}")"
16671667
__volume_id=""
16681668
if [[ "${__el_volume}" =~ geth-el-data ]]; then
1669-
__legacy_volume="$(basename "$(realpath .)")_geth-eth1-data"
1669+
__legacy_volume="$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_geth-eth1-data"
16701670
__volume_id="$(__dodocker volume ls -q -f "name=${__legacy_volume}")"
16711671
elif [[ "${__el_volume}" =~ besu-el-data ]]; then
1672-
__legacy_volume="$(basename "$(realpath .)")_besu-eth1-data"
1672+
__legacy_volume="$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_besu-eth1-data"
16731673
__volume_id="$(__dodocker volume ls -q -f "name=${__legacy_volume}")"
16741674
elif [[ "${__el_volume}" =~ nethermind-el-data ]]; then
1675-
__legacy_volume="$(basename "$(realpath .)")_nm-eth1-data"
1675+
__legacy_volume="$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_nm-eth1-data"
16761676
__volume_id="$(__dodocker volume ls -q -f "name=${__legacy_volume}")"
16771677
fi
16781678
if [ -n "${__volume_id}" ]; then
@@ -1705,7 +1705,7 @@ resync-consensus() {
17051705
esac
17061706

17071707
if [ ! "${__cl_volume}" = "wipe-db" ] && ! __dodocker volume ls -q \
1708-
| grep -q "$(basename "$(realpath .)")[_-]${__cl_volume}"; then
1708+
| grep -qi "$(basename "$(realpath .)")[_-]${__cl_volume}"; then
17091709
echo "Did not find Docker volume for ${__cl_client}. Nothing to do."
17101710
return 0
17111711
fi
@@ -1729,14 +1729,14 @@ resync-consensus() {
17291729
if [ "${__cl_volume}" = "wipe-db" ]; then
17301730
__docompose run --rm wipe-db
17311731
else
1732-
__cl_volume="$(basename "$(realpath .)")_${__cl_volume}"
1732+
__cl_volume="$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_${__cl_volume}"
17331733
__dodocker volume rm "$(__dodocker volume ls -q -f "name=${__cl_volume}")"
17341734
__volume_id=""
17351735
if [[ "${__cl_volume}" =~ lhconsensus-data ]]; then
1736-
__legacy_volume="$(basename "$(realpath .)")_lhbeacon-data"
1736+
__legacy_volume="$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_lhbeacon-data"
17371737
__volume_id="$(__dodocker volume ls -q -f "name=${__legacy_volume}")"
17381738
elif [[ "${__cl_volume}" =~ prysmconsensus-data ]]; then
1739-
__legacy_volume="$(basename "$(realpath .)")_prysmbeacon-data"
1739+
__legacy_volume="$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_prysmbeacon-data"
17401740
__volume_id="$(__dodocker volume ls -q -f "name=${__legacy_volume}")"
17411741
fi
17421742
if [ -n "${__volume_id}" ]; then
@@ -1762,7 +1762,7 @@ attach-geth() {
17621762
exit 1
17631763
fi
17641764
__legacy_datadir=$(__dodocker run --rm -v "$(__dodocker volume ls -q -f \
1765-
"name=$(basename "$(realpath .)")[_-]geth-eth1-data")":"/var/lib/goethereum" \
1765+
"name=$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')[_-]geth-eth1-data")":"/var/lib/goethereum" \
17661766
alpine:3 sh -c 'if [ -d "/var/lib/goethereum/geth/chaindata" ]; then echo true; else echo false; fi')
17671767

17681768
if [ "${__legacy_datadir}" = "true" ]; then
@@ -2729,7 +2729,7 @@ cmd() {
27292729

27302730

27312731
terminate() {
2732-
if [ -z "$(__dodocker volume ls -q -f "name=^$(basename "$(realpath .)")_[^_]+")" ]; then
2732+
if [ -z "$(__dodocker volume ls -q -f "name=^$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_[^_]+")" ]; then
27332733
echo "There are no data stores - Docker volumes - left to remove for this Ethereum node."
27342734
stop
27352735
return 0
@@ -2747,7 +2747,7 @@ terminate() {
27472747
stop
27482748
# In this case I want the word splitting, so rm can remove all volumes
27492749
# shellcheck disable=SC2046
2750-
__dodocker volume rm $(__dodocker volume ls -q -f "name=^$(basename "$(realpath .)")_[^_]+")
2750+
__dodocker volume rm $(__dodocker volume ls -q -f "name=^$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_[^_]+")
27512751
echo
27522752
echo "All containers stopped and all volumes deleted"
27532753
echo

0 commit comments

Comments
 (0)