EndeavourOS/welcome
1
0
Fork 0
mirror of https://github.com/endeavouros-team/welcome.git synced 2026-06-13 01:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[welcome] fixed some web links, particularly for ARM

Browse Source
This commit is contained in:
manuel
2023-11-30 20:31:59 +02:00
parent 4c7bf5ac3d
commit 3a14ddfeb1
4 changed files with 112 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arm-eos-welcome-installer
+16 -9
View File
@@ -29,8 +29,7 @@ SelectTerminal() {
ARM_installer_in_terminal() {
local urls=(
https://github.com/endeavouros-arm/images.git
# https://github.com/pudges-place/exper-images.git
"$ARM_IMAGES_GIT_PAGE"
)
local url ix count=${#urls[@]}
local errcode
@@ -44,10 +43,10 @@ ARM_installer_in_terminal() {
git clone $url $targetdir 2>/dev/null
errcode=$?
if [ $errcode -eq 0 ] ; then
if [ "$Manuels_internal_testing" = "yes" ] ; then
PROBLEM "$FUNCNAME called for testing only."
return
fi
#if [ "$Manuels_internal_testing" = "yes" ] ; then
# PROBLEM "$FUNCNAME called for testing only."
# return
#fi
cd $targetdir
chmod +x image-install-calamares.sh # sudo not needed here?
$terminal -e "sudo ./image-install-calamares.sh"
@@ -69,15 +68,24 @@ InfoPage() {
local browser="firefox"
[ -x /usr/bin/$browser ] || browser="kde-open"
[ -x /usr/bin/$browser ] || browser="xdg-open"
$browser https://arm.endeavouros.com/installation
$browser "$ARM_INFO_PAGE"
}
export -f InfoPage
Main() {
local progname=${0##*/}
source /usr/share/endeavouros/scripts/eos-script-lib-yad || return 1
# common configs
local file=/usr/share/endeavouros/scripts/eos-script-lib-yad
source $file || DIE "file $file not found"
AssignIconVariables_in_eos_bash_shared
# ARM configs
file=/etc/welcome-installer.conf
source $file || DIE "file $file not found"
[ "$ARM_INFO_PAGE" ] || DIE "variable ARM_INFO_PAGE not set in $file"
[ "$ARM_IMAGES_GIT_PAGE" ] || DIE "variable ARM_IMAGES_GIT_PAGE not properly set in $file"
local terminals_supported=(konsole xfce4-terminal)
local terminal="$(SelectTerminal)"
[ -n "$terminal" ] || DIE "no terminal found"
@@ -86,7 +94,6 @@ Main() {
xfce4-terminal) terminal+=" --maximize" ;;
esac
local info_url="https://arm.endeavouros.com/installation"
local icon=$ICO_CALAMARES
local title="EndeavourOS ARM image installer"
local text=""
eos-install-mode-run-calamares
+24 -11
View File
@@ -9,9 +9,13 @@ GUIDIE() {
# show error in the terminal and log
echo "$progname: $1" | sed -e 's|<tt>||g' -e 's|</tt>||g' # remove some formatting tags
local prog=eos_yad
[ "$EOS_WICON" ] || prog=yad
# show the error in a yad window
local cmd=(
eos_yad --form --title="Error detected" --text="<tt>$progname</tt>:\n$1\n"
$prog --form --title="Error detected"
--text="<b>$progname:</b>\n$1\n"
--image=dialog-error
--button=yad-quit:1
)
@@ -205,8 +209,8 @@ InstallWithLogs() {
}
run_hotfix_start() {
local file=hotfix-start.bash
local url=$(eos-github2gitlab https://raw.githubusercontent.com/endeavouros-team/ISO-hotfixes/main/$file)
local file=${HOTFIX_START_FILE##*/} # file=hotfix-start.bash
local url=$(eos-github2gitlab $HOTFIX_START_FILE)
if Wget2Curl --timeout=30 -q -O "$workdir/$file" "$url" ; then
sudo bash "$workdir/$file" >> "$prelogfile"
@@ -277,21 +281,30 @@ CheckUserPkglist() {
Main() {
local progname="${0##*/}" # for help and messages
local has_connection=no
local src_file
local src_files=(
/usr/share/endeavouros/scripts/eos-script-lib-yad
/etc/welcome-installer.conf
)
for src_file in "${src_files[@]}" ; do
source $src_file || GUIDIE "file <tt>$src_file</tt> not found?"
done
export -f eos_yad
[ -n "$HOTFIX_START_FILE" ] || GUIDIE "variable <tt>HOTFIX_START_FILE</tt> not set in <tt>/etc/welcome-installer.conf</tt>"
[ -x /usr/bin/calamares ] || GUIDIE "<tt>/usr/bin/calamares</tt> is needed for installing EndeavourOS"
eos-connection-checker && has_connection=yes
source /usr/share/endeavouros/scripts/eos-script-lib-yad || exit 1
local CurrentDesktop=""
GetCurrentDesktop CurrentDesktop # in lowercase
GetCurrentDesktop CurrentDesktop # in lowercase
AssignIconVariables_in_eos_bash_shared
export -f eos_yad
if [ ! -x /usr/bin/calamares ] ; then
GUIDIE "this program is only for installing EndeavourOS with calamares"
fi
source /usr/share/endeavouros/scripts/translations.bash || exit 1
source /usr/share/endeavouros/scripts/translations.bash || GUIDIE "file <tt>/usr/share/endeavouros/scripts/translations.bash</tt> not found?"
local testing=no
case "$1" in
--testing) testing=yes; shift ;;
esac
welcome
+36 -34
View File
@@ -279,7 +279,7 @@ ButtonsMayHide() {
INSTALL() {
local handle="$1"
local tabnum="$2"
local btdoc="https://discovery.endeavouros.com/bluetooth/bluetooth/2021/03"
local btdoc="$BLUETOOTH_INFO_PAGE"
local INSTALLER_BROWSER=firefox
local text="<b>$(ltr ins_text)</b>"
@@ -307,12 +307,12 @@ INSTALL() {
ShowChangeResoButton
if [ "$has_a_connection" = "yes" ] ; then
tabcontents+=(
--field=" $(ltr ins_blue_notes)!$ICO_BLUETOOTH!$(ltr ins_blue_notes_tip)":fbtn "$INSTALLER_BROWSER '$btdoc'"
--field=" $(ltr ins_rel)!$ICO_TIPS!$(ltr ins_reltip)":fbtn "$INSTALLER_BROWSER https://endeavouros.com/news"
--field=" $(ltr ins_tips)!$ICO_TIPS!$(ltr ins_tipstip)":fbtn "$INSTALLER_BROWSER https://discovery.endeavouros.com/category/installation"
--field=" $(ltr ins_syslog)!$ICO_TIPS!$(ltr ins_syslogtip)":fbtn "$INSTALLER_BROWSER https://discovery.endeavouros.com/forum-log-tool-options/how-to-include-systemlogs-in-your-post"
--field=" $(ltr ins_custom)!$ICO_TIPS!$(ltr ins_custom_tip)":fbtn "$INSTALLER_BROWSER 'https://discovery.endeavouros.com/installation/customizing-the-endeavouros-install-process/2022/03'"
--field=" $(ltr ins_customized)!$ICO_CUSTOM!$(ltr ins_cust_text)":fbtn "AskUserCustomUrl"
--field=" $(ltr ins_blue_notes)!$ICO_BLUETOOTH!$(ltr ins_blue_notes_tip)":fbtn "$INSTALLER_BROWSER '$btdoc'"
--field=" $(ltr ins_rel)!$ICO_TIPS!$(ltr ins_reltip)":fbtn "$INSTALLER_BROWSER $EOS_NEWS_PAGE"
--field=" $(ltr ins_tips)!$ICO_TIPS!$(ltr ins_tipstip)":fbtn "$INSTALLER_BROWSER $EOS_INSTALL_TIPS_PAGE"
--field=" $(ltr ins_syslog)!$ICO_TIPS!$(ltr ins_syslogtip)":fbtn "$INSTALLER_BROWSER $EOS_INCLUDE_LOGS_PAGE"
--field=" $(ltr ins_custom)!$ICO_TIPS!$(ltr ins_custom_tip)":fbtn "$INSTALLER_BROWSER $EOS_CUSTOMIZE_INSTALL_PAGE"
--field=" $(ltr ins_customized)!$ICO_CUSTOM!$(ltr ins_cust_text)":fbtn "AskUserCustomUrl"
)
fi
@@ -348,12 +348,12 @@ GeneralInfo() {
--image=$ICO_QUESTION
--text="$text"
--text-align=left
--field=" $(ltr general_info_ws)!$ICO_TIPS!https://endeavouros.com":fbtn "WelcomeBrowser https://endeavouros.com"
--field=" $(ltr general_info_wi)!$ICO_TIPS!$(ltr general_info_witip)":fbtn "WelcomeBrowser https://discovery.endeavouros.com"
--field=" $(ltr general_info_ne)!$ICO_TIPS!$(ltr general_info_netip)":fbtn "WelcomeBrowser https://endeavouros.com/news"
--field=" $(ltr general_info_fo)!$ICO_TIPS!$(ltr general_info_fotip)":fbtn "WelcomeBrowser https://forum.endeavouros.com"
--field=" $(ltr general_info_do)!$ICO_TIPS!$(ltr general_info_dotip)":fbtn "WelcomeBrowser https://endeavouros.com/donate"
--field=" $(ltr general_info_ab)!$ICO_TIPS!$(ltr general_info_abtip)":fbtn "WelcomeBrowser https://discovery.endeavouros.com/endeavouros-tools/welcome"
--field=" $(ltr general_info_ws)!$ICO_TIPS!$EOS_MAIN_PAGE":fbtn "WelcomeBrowser $EOS_MAIN_PAGE"
--field=" $(ltr general_info_wi)!$ICO_TIPS!$(ltr general_info_witip)":fbtn "WelcomeBrowser $EOS_DISCOVERY_PAGE"
--field=" $(ltr general_info_ne)!$ICO_TIPS!$(ltr general_info_netip)":fbtn "WelcomeBrowser $EOS_NEWS_PAGE"
--field=" $(ltr general_info_fo)!$ICO_TIPS!$(ltr general_info_fotip)":fbtn "WelcomeBrowser $EOS_FORUM_PAGE"
--field=" $(ltr general_info_do)!$ICO_TIPS!$(ltr general_info_dotip)":fbtn "WelcomeBrowser $EOS_DONATE_PAGE"
--field=" $(ltr general_info_ab)!$ICO_TIPS!$(ltr general_info_abtip)":fbtn "WelcomeBrowser $EOS_WELCOME_PAGE"
)
[ "$handle" != "calculate" ] && "${tabcontents[@]}" >& /dev/null &
@@ -573,22 +573,22 @@ DailyAssistant() {
tabcontents+=(--field=" Pacdiff $_and $differ!$differ_icon!$(ltr after_install_pacdiff_tip) $differ":fbtn "eos-pacdiff --nt")
tabcontents+=(
--field=" $(ltr ins_logtool)!$ICO_LOG!$(ltr ins_logtooltip)":fbtn "eos-log-tool"
--field=" $(ltr daily_assist_anews)!$ICO_INFO_WEB!$(ltr daily_assist_anewstip)":fbtn "WelcomeBrowser https://archlinux.org/news"
--field=" $(ltr daily_assist_anews)!$ICO_INFO_WEB!$(ltr daily_assist_anewstip)":fbtn "WelcomeBrowser $ARCH_NEWS_PAGE"
)
# General app browsing buttons:
if [ "$(eos_GetArch)" = "armv7h" ] ; then
tabcontents+=(
--field=" $(ltr add_more_apps_arch)!$ICO_INFO_WEB!$(ltr add_more_apps_done2_tip1)":fbtn "WelcomeBrowser https://www.archlinuxarm.org/packages"
--field=" $(ltr add_more_apps_arch)!$ICO_INFO_WEB!$(ltr add_more_apps_done2_tip1)":fbtn "WelcomeBrowser $ARM_PACKAGES_PAGE"
)
else
tabcontents+=(
--field=" $(ltr add_more_apps_arch)!$ICO_INFO_WEB!$(ltr add_more_apps_done2_tip1)":fbtn "WelcomeBrowser https://www.archlinux.org/packages"
--field=" $(ltr add_more_apps_arch)!$ICO_INFO_WEB!$(ltr add_more_apps_done2_tip1)":fbtn "WelcomeBrowser $ARCH_PACKAGES_PAGE"
)
fi
tabcontents+=(
--field=" $(ltr add_more_apps_aur)!$ICO_INFO_WEB!$( ltr add_more_apps_done2_tip2)":fbtn "WelcomeBrowser https://aur.archlinux.org/packages"
--field=" $(ltr daily_assist_apps)!$ICO_INFO_WEB!$(ltr daily_assist_apps_tip)":fbtn "WelcomeBrowser https://wiki.archlinux.org/title/List_of_applications"
--field=" $(ltr add_more_apps_aur)!$ICO_INFO_WEB!$( ltr add_more_apps_done2_tip2)":fbtn "WelcomeBrowser $AUR_PACKAGES_PAGE"
--field=" $(ltr daily_assist_apps)!$ICO_INFO_WEB!$(ltr daily_assist_apps_tip)":fbtn "WelcomeBrowser $ARCH_LIST_OF_APPS_PAGE"
)
if [ -n "$CurrentDesktop" ] ; then
@@ -665,20 +665,20 @@ UsefulTips() {
--image=$ICO_TIPS
--text="$text"
--field=" $(ltr after_install_pm)!$ICO_INFO_WEB!$(ltr after_install_pmtip)":fbtn "WelcomeBrowser 'https://discovery.endeavouros.com/?s=pacman'"
--field=" $(ltr after_install_ay)!$ICO_INFO_WEB!$(ltr after_install_aytip)":fbtn "WelcomeBrowser 'https://discovery.endeavouros.com/category/aur'"
--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 'https://discovery.endeavouros.com/applications/firewalld/2022/03'")
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 'https://discovery.endeavouros.com/?s=Hardware'"
--field=" $(ltr after_install_bt)!$ICO_BLUETOOTH!$(ltr after_install_bttip)":fbtn "WelcomeBrowser 'https://discovery.endeavouros.com/bluetooth/bluetooth/2021/03'" # 'https://discovery.endeavouros.com/bluetooth'
--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 https://discovery.endeavouros.com/category/nvidia")
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 https://discovery.endeavouros.com/forum-log-tool-options/how-to-include-systemlogs-in-your-post"
--field=" EndeavourOS $_and ARM!$ICO_INFO_WEB!EndeavourOS $_and ARM $(ltr after_install_info)":fbtn "WelcomeBrowser https://arm.endeavouros.com"
--field=" $(ltr after_install_ft)!$ICO_INFO_WEB!$(ltr after_install_fttip)":fbtn "WelcomeBrowser '$EOS_INCLUDE_LOGS_PAGE'"
--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"
)
@@ -701,14 +701,14 @@ AddMoreApps() {
((shown_app_buttons++))
tabcontents+=(--field=" $(ltr add_more_apps_qs)!$ICO_SYSTOOLS!$(ltr add_more_apps_qstip)":fbtn "eos-quickstart")
tabcontents+=(--field=" $(ltr daily_assist_apps)!$ICO_INFO_WEB!$(ltr daily_assist_apps_tip)":fbtn "WelcomeBrowser https://wiki.archlinux.org/title/List_of_applications")
tabcontents+=(--field=" $(ltr add_more_apps_aur)!$ICO_INFO_WEB!$( ltr add_more_apps_done2_tip2)":fbtn "WelcomeBrowser https://aur.archlinux.org/packages")
tabcontents+=(--field=" $(ltr daily_assist_apps)!$ICO_INFO_WEB!$(ltr daily_assist_apps_tip)":fbtn "WelcomeBrowser $ARCH_LIST_OF_APPS_PAGE")
tabcontents+=(--field=" $(ltr add_more_apps_aur)!$ICO_INFO_WEB!$( ltr add_more_apps_done2_tip2)":fbtn "WelcomeBrowser $AUR_PACKAGES_PAGE")
# General app browsing buttons:
if [ "$(eos_GetArch)" = "armv7h" ] ; then
tabcontents+=(--field=" $(ltr add_more_apps_arch)!$ICO_INFO_WEB!$(ltr add_more_apps_done2_tip1)":fbtn "WelcomeBrowser https://www.archlinuxarm.org/packages")
tabcontents+=(--field=" $(ltr add_more_apps_arch)!$ICO_INFO_WEB!$(ltr add_more_apps_done2_tip1)":fbtn "WelcomeBrowser $ARM_PACKAGES_PAGE")
else
tabcontents+=(--field=" $(ltr add_more_apps_arch)!$ICO_INFO_WEB!$(ltr add_more_apps_done2_tip1)":fbtn "WelcomeBrowser https://www.archlinux.org/packages")
tabcontents+=(--field=" $(ltr add_more_apps_arch)!$ICO_INFO_WEB!$(ltr add_more_apps_done2_tip1)":fbtn "WelcomeBrowser $ARCH_PACKAGES_PAGE")
fi
# Now we know if we have any apps in the install list.
@@ -865,7 +865,7 @@ WelcomeHelp_opt() {
--image=$ICO_HELP --button=yad-ok:0
}
WelcomeHelp() {
WelcomeBrowser "https://discovery.endeavouros.com/endeavouros-tools/welcome"
WelcomeBrowser "$EOS_WELCOME_PAGE"
}
export -f WelcomeHelp
@@ -875,12 +875,12 @@ WelcomeBrowser() {
export -f WelcomeBrowser
WelcomeChangelog() {
WelcomeBrowser "$(Github2Gitlab https://github.com/endeavouros-team/PKGBUILDS/commits/master/welcome)"
WelcomeBrowser "$(Github2Gitlab $WELCOME_CHANGELOG_PAGE)"
}
export -f WelcomeChangelog
ImportantNews() {
WelcomeBrowser "$(Github2Gitlab https://github.com/endeavouros-team/Important-news/blob/main/README.md)"
WelcomeBrowser "$(Github2Gitlab $WELCOME_NEWS_PAGE)"
}
export -f ImportantNews
@@ -1387,6 +1387,8 @@ StartHere() {
local ISO_VERSION="" # only for the installer
local CurrentDesktop=""
source /etc/welcome-installer.conf || DIE "file /etc/welcome-installer.conf not found"
for arg in "$@" ; do
case "$arg" in
--verboselog) export WELCOME_VERBOSE_LOG=yes ;;
@@ -1554,7 +1556,7 @@ StartHere() {
# local adding_own_commands=$(Github2Gitlab https://github.com/endeavouros-team/PKGBUILDS/blob/master/welcome/Adding-own-commands.md)
# gitlab doesn't have this file yet...
local adding_own_commands=https://github.com/endeavouros-team/welcome/blob/master/Adding-own-commands.md
local adding_own_commands=$WELCOME_ADD_COMMANDS_INFO
local own_commands_conf="$HOME/.config/welcome-own-cmds.conf"
if [ -r "$own_commands_conf" ] ; then
welcome-installer.conf
+36
View File
@@ -0,0 +1,36 @@
#!/bin/bash
# Web links for the Welcome installer and installed system.
## common configs
export HOTFIX_START_FILE=https://raw.githubusercontent.com/endeavouros-team/ISO-hotfixes/main/hotfix-start.bash
export BLUETOOTH_INFO_PAGE=https://discovery.endeavouros.com/bluetooth/bluetooth
export EOS_NEWS_PAGE=https://endeavouros.com/news
export EOS_INSTALL_TIPS_PAGE=https://discovery.endeavouros.com/category/installation
export EOS_INCLUDE_LOGS_PAGE=https://discovery.endeavouros.com/forum-log-tool-options/how-to-include-systemlogs-in-your-post
export EOS_CUSTOMIZE_INSTALL_PAGE=https://discovery.endeavouros.com/installation/customizing-the-endeavouros-install-process
export EOS_MAIN_PAGE=https://endeavouros.com
export EOS_DISCOVERY_PAGE=https://discovery.endeavouros.com
export EOS_FORUM_PAGE=https://forum.endeavouros.com
export EOS_DONATE_PAGE=https://endeavouros.com/donate
export EOS_WELCOME_PAGE=https://discovery.endeavouros.com/endeavouros-tools/welcome
export WELCOME_CHANGELOG_PAGE=https://github.com/endeavouros-team/PKGBUILDS/commits/master/welcome
export WELCOME_NEWS_PAGE=https://github.com/endeavouros-team/Important-news/blob/main/README.md
export WELCOME_ADD_COMMANDS_INFO=https://github.com/endeavouros-team/welcome/blob/master/Adding-own-commands.md
export EOS_PACKAGE_MGMT_URL='https://discovery.endeavouros.com/?s=pacman'
export EOS_AUR_YAY_URL=https://discovery.endeavouros.com/category/aur
export EOS_FIREWALLD_INFO_PAGE=https://discovery.endeavouros.com/applications/firewalld
export EOS_HARDWARE_PAGE='https://discovery.endeavouros.com/?s=Hardware'
export EOS_NVIDIA_INFO_PAGE=https://discovery.endeavouros.com/category/nvidia
export ARCH_NEWS_PAGE=https://archlinux.org/news
export ARCH_PACKAGES_PAGE=https://www.archlinux.org/packages
export AUR_PACKAGES_PAGE=https://aur.archlinux.org/packages
export ARCH_LIST_OF_APPS_PAGE=https://wiki.archlinux.org/title/List_of_applications
## ARM configs
export ARM_MAIN_PAGE=https://endeavouros.com/endeavouro-arm # the page has a typo !!!
export ARM_INFO_PAGE=https://endeavouros.com/endeavouros-arm-install
export ARM_IMAGES_GIT_PAGE=https://github.com/endeavouros-arm/images.git
export ARM_PACKAGES_PAGE=https://www.archlinuxarm.org/packages