diff --git a/.gitignore b/.gitignore index 2c9cc0461..bac09d963 100644 --- a/.gitignore +++ b/.gitignore @@ -44,5 +44,7 @@ failed-tests.log .tsbuildinfo -# bootstrap flag +# legacy bootstrap flag I_HAVE_BOOTSTRAPPED_OK +# new bootstrap flag +BOOTSTRAP_OK \ No newline at end of file diff --git a/Justfile b/Justfile index 9b6ced1f8..2aaf2e3db 100644 --- a/Justfile +++ b/Justfile @@ -44,5 +44,5 @@ setup-fish: # force a re-bootstrap bootstrap: - -@rm I_HAVE_BOOTSTRAPPED_OK + -@rm BOOTSTRAP_OK ./dev/bootstrap.sh \ No newline at end of file diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh index 421e6395f..18752a627 100755 --- a/dev/bootstrap.sh +++ b/dev/bootstrap.sh @@ -97,7 +97,7 @@ function syncDatabaseWithSeeds { # always setup the shell setupShell -if [ -e I_HAVE_BOOTSTRAPPED_OK ]; then +if [ -e BOOTSTRAP_OK ]; then echo "Already bootstrapped." exit 0 fi @@ -111,7 +111,7 @@ installLocalDebs echo "Bootstrap Complete." -cat << EOF > I_HAVE_BOOTSTRAPPED_OK +cat << EOF > BOOTSTRAP_OK Tachi was bootstrapped here on $(date). The existence of this file stops Tachi from bootstrapping again. diff --git a/dev/functions.fish b/dev/functions.fish index 9064ecf04..c591b2b86 100644 --- a/dev/functions.fish +++ b/dev/functions.fish @@ -35,7 +35,7 @@ function fish_greeting echo "Welcome to $(rgb "Tachi" e61c6e 131313)!" - if ! test -e /tachi/I_HAVE_BOOTSTRAPPED_OK + if ! test -e /tachi/BOOTSTRAP_OK echo "" echo $(rgb "Something went wrong and Tachi didn't set up correctly." ff0000 000000) echo ""