✨ default to no icons in setup

jcaillon · Apr 26, 2024 · 6e94a4f · 6e94a4f
1 parent 0ffac7d
commit 6e94a4f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/tests.d/1104-self-setup/results.approved.md b/tests.d/1104-self-setup/results.approved.md
@@ -32,14 +32,14 @@ An information icon: II
 [2m   │[0m Do you correctly see the nerd icons in the icon check above the line? [2m│[0m
 [2m   └─[69b─┘\[0m
 [1G[0J
-[1F[?25l[7m   (Y)ES   [0m      (N)O   [0m[1G[0K[?25h[2m ┌─[3b─┐[0m
+[1F[?25l   (Y)ES   [0m   [7m   (N)O   [0m[1G[0K[?25h[2m ┌─[3b─┐[0m
 [2m │[0m No. [2m│[0m
 [2m/└─[3b─┘[0m
 [2m   ┌─[41b─┐[0m
 [2m   │[0m Do you want to enable the icons in Valet? [2m│[0m
 [2m   └─[41b─┘\[0m
 [1G[0J
-[1F[?25l[7m   (Y)ES   [0m      (N)O   [0m[1G[0K[?25h[2m ┌─[3b─┐[0m
+[1F[?25l   (Y)ES   [0m   [7m   (N)O   [0m[1G[0K[?25h[2m ┌─[3b─┐[0m
 [2m │[0m No. [2m│[0m
 [2m/└─[3b─┘[0m
 ```
@@ -91,7 +91,7 @@ An information icon: II
 [2m   │[0m Do you correctly see the nerd icons in the icon check above the line? [2m│[0m
 [2m   └─[69b─┘\[0m
 [1G[0J
-[1F[?25l[7mCAB   (Y)ES   [0m   [7mCUB   (N)O   [0m[1G[0K[?25h[2m ┌─[4b─┐[0m
+[1F[?25l[7mCUB   (Y)ES   [0m   [7mCAB   (N)O   [0m[1G[0K[?25h[2m ┌─[4b─┐[0m
 [2m │[0m Yes. [2m│[0m
 [2m/└─[4b─┘[0m
 [2m   ┌─[32b─┐[0m

diff --git a/valet.d/commands.d/self-setup.sh b/valet.d/commands.d/self-setup.sh
@@ -53,10 +53,10 @@ function selfSetup() {
   printf '%s\n' "An information icon: ${VALET_CONFIG_ICON_INFO:-$'\uf05a'}"
   printf '%s\n' "─────────────────────────────────────"
 
-  if ! interactive::promptYesNo "Do you correctly see the nerd icons in the icon check above the line?"; then
+  if ! interactive::promptYesNo "Do you correctly see the nerd icons in the icon check above the line?" false; then
     log::info "If you see the replacement character ? in my terminal, it means you don't have a nerd-font setup in your terminal."$'\n'"You can download any font here: https://www.nerdfonts.com/font-downloads and install it."$'\n'"After that, you need to setup your terminal to use this newly installed font."$'\n'"You can also choose to enable the icons in Valet if you plan to install a nerd font."
 
-    if interactive::promptYesNo "Do you want to enable the icons in Valet?"; then
+    if interactive::promptYesNo "Do you want to enable the icons in Valet?" false; then
       export VALET_CONFIG_ENABLE_NERDFONT_ICONS=true
     else
       export VALET_CONFIG_ENABLE_NERDFONT_ICONS=false

diff --git a/valet.d/core b/valet.d/core
@@ -12,7 +12,7 @@ if [[ -z "${GLOBAL_VALET_HOME:-}" ]]; then
   GLOBAL_VALET_HOME="${BASH_SOURCE[0]}"
   if [[ "${GLOBAL_VALET_HOME}" != /* ]]; then
     # resolve relative path
-    if pushd "${GLOBAL_VALET_HOME%/*}" &>/dev/null; then GLOBAL_VALET_HOME="${PWD}"; popd &>/dev/null;
+    if pushd "${GLOBAL_VALET_HOME%/*}" &>/dev/null; then GLOBAL_VALET_HOME="${PWD}"; popd 1>/dev/null;
     else GLOBAL_VALET_HOME="${PWD}"; fi
   else
     GLOBAL_VALET_HOME="${GLOBAL_VALET_HOME%/*}" # strip filename

diff --git a/valet.d/lib-io b/valet.d/lib-io
@@ -28,7 +28,7 @@ function io::toAbsolutePath() {
 
   if pushd "${file%/*}" &>/dev/null; then
     LAST_RETURNED_VALUE="${PWD}/${file##*/}"
-    popd &>/dev/null
+    popd 1>/dev/null
     return 0
   fi
 

diff --git a/valet.d/version b/valet.d/version
@@ -1 +1 @@
-0.7.547
+0.7.553