[welcome] added arch-chroot info page button under the UsefulTips tab

endeavouros-team · Dec 10, 2024 · c94640f · c94640f
1 parent 11b8551
commit c94640f
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 19 deletions.
diff --git a/welcome b/welcome
@@ -684,30 +684,34 @@ UsefulTips() {
       --plug="$handle" --tabnum="$tabnum" --form --columns=2
       --image=$ICO_TIPS
       --text="$text"
-
-      --field=" $(ltr after_install_pm)!$ICO_INFO_WEB!$(ltr after_install_pmtip)":fbtn     "WelcomeBrowser $EOS_PACKAGE_MGMT_URL"
-      --field=" $(ltr after_install_ay)!$ICO_INFO_WEB!$(ltr after_install_aytip)":fbtn     "WelcomeBrowser '$EOS_AUR_YAY_URL'"
-  )
-  if [ -x /usr/bin/firewalld ] ; then
-      tabcontents+=(--field=" $(ltr after_install_fw)!$ICO_INFO_WEB!$(ltr after_install_fwtip)":fbtn "WelcomeBrowser '$EOS_FIREWALLD_INFO_PAGE'")
-  fi
-  tabcontents+=(
-      --field=" $(ltr after_install_hn)!$ICO_INFO_WEB!$(ltr after_install_hntip)":fbtn      "WelcomeBrowser $EOS_HARDWARE_PAGE"
-      --field=" $(ltr after_install_bt)!$ICO_BLUETOOTH!$(ltr after_install_bttip)":fbtn     "WelcomeBrowser '$BLUETOOTH_INFO_PAGE'"
-  )
-  test "$(eos_GetArch)" != "armv7h" && tabcontents+=(--field=" $(ltr after_install_nv)!$ICO_INFO_WEB!$(ltr after_install_nvtip)":fbtn "WelcomeBrowser '$EOS_NVIDIA_INFO_PAGE'")
-  tabcontents+=(
-      --field=" $(ltr after_install_ft)!$ICO_INFO_WEB!$(ltr after_install_fttip)":fbtn     "WelcomeBrowser '$EOS_INCLUDE_LOGS_PAGE'"
-      --field=" $(ltr after_install_reisub)!$ICO_INFO_WEB!$(ltr after_install_reisubtip)":fbtn     "WelcomeBrowser '$REISUB_PAGE'"
-      --field=" $(ltr after_install_reisub2)!$ICO_INFO_WEB!$(ltr after_install_reisubtip)":fbtn    "Reisub --enable"
-      --field=" EndeavourOS $_and ARM!$ICO_INFO_WEB!EndeavourOS $_and ARM $(ltr after_install_info)":fbtn      "WelcomeBrowser $ARM_MAIN_PAGE"
-      --field=" $(ltr butt_owncmds_help)!$ICO_INFO_WEB!$(ltr nb_tab_owncmdstip)":fbtn      "WelcomeBrowser $adding_own_commands"
-      --field=" $(ltr butt_owncmds_dnd)!$ICO_SYSTOOLS!$(ltr butt_owncmds_dnd_help)":fbtn   "welcome-dnd"
   )
+  AddWelcomeTipPages
 
   [ "$handle" != "calculate" ] && "${tabcontents[@]}" >& /dev/null &
 }
 
+AddWelcomeTipPages() {
+    local WELCOME_TIP_PAGES=()
+    local -r file=/usr/share/endeavouros/scripts/welcome-tip-pages   # contains the WELCOME_TIP_PAGES array
+    source $file || return 1
+    local button tip url_or_command ico
+    local item                                       # button name | description or tip | url
+    for item in "${WELCOME_TIP_PAGES[@]}" ; do
+        ico=""
+        button="${item%%|*}"                                             ; item=${item#*|}
+        [ "$button" = "$item" ]         || tip="${item%%|*}"             ; item=${item#*|}
+        [ "$tip" = "$item" ]            || url_or_command="${item%%|*}"  ; item=${item#*|}
+        [ "$url_or_command" = "$item" ] || ico="${item%%|*}"             # ; item=${item#*|}
+
+        [ "$ico" ] || ico="$ICO_INFO_WEB"    # not all definitions include icon field
+
+        case "$ico" in
+            "$ICO_INFO_WEB") tabcontents+=(--field=" $button!$ico!$tip":fbtn  "WelcomeBrowser '$url_or_command'") ;;
+            *)               tabcontents+=(--field=" $button!$ico!$tip":fbtn  "$url_or_command")
+        esac
+    done
+}
+
 AddMoreApps() {
   local handle="$1"
   local tabnum="$2"

diff --git a/welcome-tip-pages b/welcome-tip-pages
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# button name | description or tip | url | icon (optional)
+
+WELCOME_TIP_PAGES=(
+    "$(ltr after_install_pm)|$(ltr after_install_pmtip)|'$EOS_PACKAGE_MGMT_URL'"
+    "$(ltr after_install_ay)|$(ltr after_install_aytip)|'$EOS_AUR_YAY_URL'"
+)
+
+WELCOME_TIP_PAGES+=(
+    "$(ltr after_install_hn)|$(ltr after_install_hntip)|'$EOS_HARDWARE_PAGE'"
+    "$(ltr after_install_bt)|$(ltr after_install_bttip)|'$BLUETOOTH_INFO_PAGE'"
+)
+
+if [ -x /usr/bin/firewalld ] ; then
+    WELCOME_TIP_PAGES+=( "$(ltr after_install_fw)|$(ltr after_install_fwtip)|'$EOS_FIREWALLD_INFO_PAGE'" )
+fi
+if [ "$(eos_GetArch)" != "armv7h" ] ; then
+    WELCOME_TIP_PAGES+=("$(ltr after_install_nv)|$(ltr after_install_nvtip)|'$EOS_NVIDIA_INFO_PAGE'")
+fi
+
+WELCOME_TIP_PAGES+=(
+    "$(ltr after_install_ft)|$(ltr after_install_fttip)|'$EOS_INCLUDE_LOGS_PAGE'"                       # Forum tips
+    "EndeavourOS $_and ARM|EndeavourOS $_and ARM $(ltr after_install_info)|'$ARM_MAIN_PAGE'"
+    "$(ltr arch_chroot)|$(ltr arch_chroot_tip)|'https://discovery.endeavouros.com/system-rescue/arch-chroot'"
+
+    "$(ltr after_install_reisub)|$(ltr after_install_reisubtip)|'$REISUB_PAGE'"
+    "$(ltr after_install_reisub2)|$(ltr after_install_reisubtip)|Reisub --enable|$ICO_CUSTOM"
+
+    "$(ltr butt_owncmds_help)|$(ltr nb_tab_owncmdstip)|$adding_own_commands"
+    "$(ltr butt_owncmds_dnd)|$(ltr butt_owncmds_dnd_help)|welcome-dnd|$ICO_SYSTOOLS"
+)