Skip to content

Commit

Permalink
Earlier check for snap (#1799)
Browse files Browse the repository at this point in the history
  • Loading branch information
yorickdowne authored Apr 10, 2024
1 parent 294918d commit 07eee0f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions ethd
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ install-bash-completions() {


install() {
check_for_snap

read -rp "This will attempt to install Docker and make your user part of the docker group. Do you wish to \
continue? (no/yes) " yn
Expand Down Expand Up @@ -1301,7 +1300,6 @@ reset to defaults."

unset ETHDSECUNDO
unset GITEXITCODE
check_for_snap
if [ "${__dirty}" -eq 1 ]; then
echo
echo "WARNING"
Expand Down Expand Up @@ -2991,7 +2989,6 @@ check_legacy() {
}

config() {
check_for_snap
# Do not track changes to ext-network.yml
${__as_owner} git update-index --assume-unchanged ext-network.yml
# Create ENV file if needed
Expand Down Expand Up @@ -3372,6 +3369,8 @@ handle_root
determine_distro
prep_conffiles

check_for_snap

# Don't check for Docker before it's installed
if [ "$__command" = "install" ]; then
$__command "$@"
Expand Down

0 comments on commit 07eee0f

Please sign in to comment.