update homepage

usr/bin/archboot-network.sh

@@ -168,7 +168,7 @@ _network() {
         _dialog --title " Summary " --yesno "Interface:    ${_INTERFACE}\nConnection:   ${_CONNECTION}\nNetwork profile: ${_NETWORK_PROFILE}\nSSID:      ${_WLAN_SSID}\nHidden:     ${_WLAN_HIDDEN}\nKey:        ${_WLAN_KEY}\ndhcp or static: ${_IP}\nIP address: ${_IPADDR}\nGateway:    ${_GW}\nDNS server: ${_DNS}\nProxy setting: ${_PROXY}" 0 0 && _NETPARAMETERS=1
     done
     # write systemd-networkd profile
-    echo "#$_NETWORK_PROFILE generated by archboot setup" > "${_NETWORK_PROFILE}"
+    echo "#$_NETWORK_PROFILE generated by Archboot setup" > "${_NETWORK_PROFILE}"
     #shellcheck disable=SC2129
     echo "[Match]"  >> "${_NETWORK_PROFILE}"
     echo "Name=${_INTERFACE}" >> "${_NETWORK_PROFILE}"

usr/bin/archboot-quickinst.sh

@@ -44,7 +44,7 @@ _prepare_pacman() {
 
 # package_installation
 _install_packages() {
-    # add packages from archboot defaults
+    # add packages from Archboot defaults
     _PACKAGES="$(rg -o '^_PACKAGES="(.*)"' -r '$1' /etc/archboot/defaults)"
     # fallback if _PACKAGES is empty
     [[ -z "${_PACKAGES}" ]] && _PACKAGES="base linux linux-firmware"

usr/lib/archboot/bootloader.sh

@@ -15,7 +15,7 @@ _GRUB_ISO="/usr/share/archboot/grub/archboot-iso-grub.cfg"
 _usage() {
     echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Bootloader\e[m"
     echo -e "\e[1m---------------------\e[m"
-    echo "Upload bootloaders to archboot server."
+    echo "Upload bootloaders to an Archboot server."
     echo ""
     echo -e "Usage: \e[1m${_BASENAME} run\e[m"
     exit 0

usr/lib/archboot/common.sh

@@ -55,10 +55,10 @@ _root_check() {
     fi
 }
 
-### check for archboot environment
+### check for Archboot environment
 _archboot_check() {
 if ! rg -qw 'archboot' /etc/hostname; then
-    echo "This script should only be run in booted archboot environment. Aborting..."
+    echo "This script should only be run in booted Archboot Environment. Aborting..."
     exit 1
 fi
 }
@@ -193,7 +193,7 @@ _container_check() {
 
 _generate_keyring() {
     # use fresh one on normal systems
-    # copy existing gpg cache on archboot usage
+    # copy existing gpg cache on Archboot usage
     if ! rg -qw archboot /etc/hostname; then
         # generate pacman keyring
         echo "Generating pacman keyring in container..."

usr/lib/archboot/container.sh

@@ -6,13 +6,13 @@
 _usage () {
     echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Create Container\e[m"
     echo -e "\e[1m---------------------------\e[m"
-    echo "This will create an archboot container for an archboot image."
-    echo ""
+    echo "This will create an Archboot container for an Archboot image."
+    echo
     echo "Options:"
-    echo " -cc    Cleanup container eg. removing manpages, includes..."
-    echo " -cp    Cleanup container package cache"
-    echo " -install-source=<server>    Use <server> containing archboot repository"
-    echo ""
+    echo -e " \e[1m-cc\e[m    Cleanup container eg. removing manpages, includes..."
+    echo -e " \e[1m-cp\e[m    Cleanup container package cache"
+    echo -e " \e[1m-install-source=<server>\e[m    Use <server> containing Archboot repository"
+    echo
     echo -e "Usage: \e[1m${_BASENAME} <directory> <options>\e[m"
     exit 0
 }
@@ -34,7 +34,7 @@ _clean_cache() {
         rm -r "${1}${_CACHEDIR}"
     fi
     if rg -qw 'archboot' /etc/hostname; then
-        echo "Cleaning archboot ${_CACHEDIR}..."
+        echo "Cleaning Archboot ${_CACHEDIR}..."
         for i in "${1}${_CACHEDIR}"/*; do
             [[ "${i}" == "${1}${_LOCAL_DB}" ]] || rm -f "${_CACHEDIR}"/"$(basename "${i}")"
         done
@@ -91,7 +91,7 @@ _prepare_pacman() {
     mount udev "${1}/dev" -t devtmpfs -o mode=0755,nosuid
     mount devpts "${1}/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec
     mount shm "${1}/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev
-    echo "Removing archboot repository sync db..."
+    echo "Removing Archboot repository sync db..."
     rm -f "${_PACMAN_LIB}"/sync/archboot.db
     echo "Updating Arch Linux keyring..."
     #shellcheck disable=SC2086
@@ -104,7 +104,7 @@ _create_pacman_conf() {
         echo "Using default pacman.conf..."
         [[ "${2}" == "use_binfmt" ]] && _PACMAN_CONF="${1}${_PACMAN_CONF}"
         if ! rg -qw "\[archboot\]" "${_PACMAN_CONF}"; then
-            echo "Adding archboot repository to ${_PACMAN_CONF}..."
+            echo "Adding Archboot repository to ${_PACMAN_CONF}..."
             echo "[archboot]" >> "${_PACMAN_CONF}"
             echo "Server = https://pkg.archboot.com" >> "${_PACMAN_CONF}"
         fi
@@ -214,7 +214,7 @@ _install_archboot() {
     # cleanup
     if ! [[ "${2}"  == "use_binfmt" ]]; then
         rm -r "${1}"/blankdb
-        echo "Removing archboot repository sync db..."
+        echo "Removing Archboot repository sync db..."
         rm "${_PACMAN_LIB}"/sync/archboot.db
     fi
 }
@@ -223,12 +223,12 @@ _copy_mirrorlist_and_pacman_conf() {
     # copy local mirrorlist to container
     echo "Creating pacman config and mirrorlist in container..."
     cp "/etc/pacman.d/mirrorlist" "${1}/etc/pacman.d/mirrorlist"
-    # only copy from archboot pacman.conf, else use default file
+    # only copy from Archboot pacman.conf, else use default file
     rg -qw 'archboot' /etc/hostname && cp /etc/pacman.conf "${1}"/etc/pacman.conf
 }
 
 _copy_archboot_defaults() {
-    echo "Copying archboot defaults to container..."
+    echo "Copying Archboot defaults to container..."
     cp /etc/archboot/defaults "${1}"/etc/archboot/defaults
 }
 

usr/lib/archboot/cpio/cpio.sh

@@ -12,7 +12,7 @@ _TARGET_DIR=""
 _usage() {
     echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Cpio\e[m"
     echo -e "\e[1m---------------\e[m"
-    echo "Tool for creating an archboot initramfs image."
+    echo "Tool for creating an Archboot initramfs image."
     echo
     echo "Options:"
     echo " -h               Display this message and exit"

usr/lib/archboot/cpio/hooks/base_common_system

@@ -14,7 +14,7 @@ etc/{bash_completion.d,ca-certificates/extracted,default,pam.d,profile.d,securit
 usr/lib/{coreutils,cryptsetup,gconv,modules-load.d,p11-kit,pam.d,pkcs11,polkit-1,security,sysctl.d,systemd,sysusers.d,tmpfiles.d,udev} \
 usr/share/{bash-completion,dbus-1,factory,hwdata,i18n/locales,makepkg,nano,pacman/keyrings,polkit-1,readline,systemd,terminfo} \
 | tar -C "${_ROOTFS}" -xpf -
-    # only run on archboot container
+    # only run on Archboot container
     if rg -qw 'archboot' /etc/hostname; then
         _map _binary locale{-gen,def}
         _map _file /etc/locale.gen /usr/share/locale/locale.alias

usr/lib/archboot/cpio/init.sh

@@ -64,8 +64,8 @@ _task() {
             if ! mount /mnt/cdrom/efi.img /mnt/efi &>"${_NO_LOG}"; then
                 _clear
                 _wrn "Archboot Emergeny Shell:"
-                _wrn "Error: Didn't find a device with archboot rootfs!"
-                _msg "This needs further debugging. Please contact the archboot author."
+                _wrn "Error: Didn't find a device with Archboot rootfs!"
+                _msg "This needs further debugging. Please contact the Archboot author."
                 _msg "Tobias Powalowski: tpowa@archlinux.org"
                 echo ""
                 systemctl start emergency.service

usr/lib/archboot/installer/pacman.sh

@@ -62,7 +62,7 @@ _run_autoconfig() {
 _install_packages() {
     _destdir_mounts || return 1
     _PACKAGES=""
-    # add packages from archboot defaults
+    # add packages from Archboot defaults
     _PACKAGES="$(rg -o '^_PACKAGES="(.*)"' -r '$1' /etc/archboot/defaults)"
     # fallback if _PACKAGES is empty
     [[ -z "${_PACKAGES}" ]] && _PACKAGES="base linux linux-firmware"

usr/lib/archboot/iso.sh

@@ -9,16 +9,16 @@ _BOOTLOADER="/usr/share/archboot/bootloader"
 _usage () {
     echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Create ${_ARCH} USB/CD Image\e[m"
     echo -e "\e[1m--------------------------------------\e[m"
-    echo "This will create an archboot iso image."
-    echo ""
+    echo "This will create an Archboot iso image."
+    echo
     echo "Options:"
-    echo " -g              Starting generation of image."
-    echo " -c=CONFIG       Which CONFIG should be used."
+    echo -e " \e[1m-g\e[m              Starting generation of image."
+    echo -e " \e[1m-c=CONFIG\e[m       Which CONFIG should be used."
     echo "                 ${_CONFIG_DIR} includes the config files"
     echo "                 default=${_ARCH}.conf"
-    echo " -i=IMAGENAME    Your IMAGENAME."
-    echo " -s              Save initramfs files in current work directory"
-    echo ""
+    echo -e " \e[1m-i=IMAGENAME\e[m    Your IMAGENAME."
+    echo -e " \e[1m-s\e[m              Save initramfs files in current work directory"
+    echo
     echo -e "Usage: \e[1m${_BASENAME} <options>\e[m"
     exit 0
 }
@@ -94,7 +94,7 @@ _prepare_kernel_initrd_files() {
         archboot-cpio.sh -c "${_CONFIG}" -k "${_KERNEL}" \
                          -g "${_ISODIR}/boot/initrd-${_ARCH}.img" || exit 1
     fi
-    # delete cachedir on archboot environment
+    # delete cachedir on Archboot environment
     if rg -qw 'archboot' /etc/hostname; then
         if [[ -d "${_CACHEDIR}" ]]; then
             echo "Removing ${_CACHEDIR}..."

usr/lib/archboot/qemu.sh

@@ -17,7 +17,7 @@ _ARCH_SERVERDIR="/${_PUB}/src/qemu"
 _usage() {
     echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Qemu\e[m"
     echo -e "\e[1m---------------\e[m"
-    echo "Upload qemu files to archboot server."
+    echo "Upload qemu files to an Archboot server."
     echo ""
     echo -e "Usage: \e[1m${_BASENAME} run\e[m"
     exit 0

usr/lib/archboot/release.sh

@@ -19,8 +19,8 @@ _W_DIR="$(mktemp -u archboot-release.XXX)"
 _usage () {
     echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Create Release Images\e[m"
     echo -e "\e[1m--------------------------------\e[m"
-    echo "This will create an archboot release image in <directory>."
-    echo "Optional: You can specify a certain <server> with an archboot repository."
+    echo "This will create an Archboot release image in <directory>."
+    echo "Optional: You can specify a certain <server> with an Archboot repository."
     echo ""
     echo -e "Usage: \e[1m${_BASENAME} <directory> <server>\e[m"
     exit 0

usr/lib/archboot/repository.sh

@@ -7,7 +7,7 @@ _GPG_KEY="/usr/share/archboot/gpg/tpowa.gpg"
 _usage () {
     echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Create Repository\e[m"
     echo -e "\e[1m----------------------------\e[m"
-    echo "This will create an archboot repository for an archboot image."
+    echo "This will create an Archboot repository for an Archboot image."
     echo ""
     echo -e "Usage: \e[1m${_BASENAME} <directory>\e[m"
     exit 0

usr/lib/archboot/server.sh

@@ -8,7 +8,7 @@ _ISO_BUILD_DIR="$(mktemp -d "${_ISO_HOME_ARCH}"/server-release.XXX)"
 _usage() {
     echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Server Release\e[m"
     echo -e "\e[1m-------------------------\e[m"
-    echo "Upload new image to archboot server."
+    echo "Upload new image to an Archboot server."
     echo ""
     echo -e "Usage: \e[1m${_BASENAME} run\e[m"
     exit 0
@@ -108,7 +108,7 @@ _sign_b2sum() {
 _update_source() {
     cd "${_ISO_HOME_SOURCE}" || exit 1
     _create_archive
-    echo "Creating ${_ARCH} archboot repository..."
+    echo "Creating ${_ARCH} Archboot repository..."
     "archboot-${_ARCH}-create-repository.sh" "${_DIR}" || exit 1
     chown -R "${_USER}:${_GROUP}" "${_DIR}"
     _server_upload "${_SERVER_SOURCE_DIR}" "${_ISO_HOME_SOURCE}"

usr/lib/archboot/update/sway.sh

@@ -13,7 +13,7 @@ _configure_sway() {
     echo "Configuring foot..."
     if ! rg -q 'archboot colors' /etc/xdg/foot/foot.ini; then
 cat <<EOF >> /etc/xdg/foot/foot.ini
-# archboot colors
+# Archboot colors
 [colors]
 background=000000
 foreground=ffffff

usr/lib/archboot/update/update.sh

@@ -28,9 +28,11 @@ _graphic_options() {
 }
 
 _usage () {
-    echo -e "\e[1mManage \e[36mArchboot\e[m\e[1m - Environment:\e[m"
+    echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Manage Environment:\e[m"
     echo -e "\e[1m------------------------------\e[m"
-    echo -e " \e[1m-help\e[m            This message."
+    echo "The main tool to manage or update the Archboot Environment."
+    echo
+    echo "Options:"
     if [[ ! -e "${_LOCAL_DB}" || -e "/usr/bin/setup" ]]; then
         echo -e " \e[1m-update\e[m          Update scripts: setup, quickinst, network, clock and helpers."
     fi
@@ -41,7 +43,7 @@ _usage () {
     elif [[ "${_MEM_TOTAL}" -gt 2571000 && ! -e "/.full_system" && -e "${_LOCAL_DB}" && -e "/usr/bin/setup" ]]; then
         echo -e " \e[1m-full-system\e[m     Switch to full Arch Linux system."
     fi
-    echo -e ""
+    echo
     if [[ -e "/usr/bin/setup" ]]; then
         # works only on latest image
         if ! [[ -e "${_LOCAL_DB}" ]]; then
@@ -73,6 +75,8 @@ _usage () {
             echo -e " \e[1m-latest-image\e[m    Generate latest image files in /archboot directory."
         fi
     fi
+    echo
+    echo -e "Usage: \e[1m${_BASENAME} <option>\e[m"
     exit 0
 }
 # vim: set ft=sh ts=4 sw=4 et:

usr/lib/archboot/update/xfce.sh

@@ -125,7 +125,7 @@ EOF
     echo "Setting breeze as default icons..."
     sd '<property name="IconThemeName" type="string" value="Adwaita"/>' '<property name="IconThemeName" type="string" value="breeze"/>' \
     /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
-    echo "Setting archboot background image..."
+    echo "Setting Archboot background image..."
     cat << EOF >/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
 <?xml version="1.0" encoding="UTF-8"?>
 

usr/lib/systemd/system/archboot-server-update.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Check, build and upload archboot images at night
+Description=Check, build and upload Archboot images at night
 
 [Service]
 ExecStart=/usr/bin/archboot-server-update.sh run

usr/share/archboot/base/etc/systemd/system/archboot-init.service

@@ -2,7 +2,7 @@
 # by Tobias Powalowski <tpowa@archlinux.org>
 
 [Unit]
-Description=Initializes archboot rootfs
+Description=Initializes Archboot rootfs
 After=systemd-udev-trigger.service
 
 [Service]

usr/share/archboot/doc/archboot.html

@@ -17,7 +17,7 @@
 <h1>Archboot Home | <a href="https://archboot.com/gallery.html">Gallery</a> | <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=Z7GXKW4MKHK7C"><img src="donate.png" alt="Donate"></a></h1>
 <h2>2024 Fundraise: 0% <progress max="100" value="48">0%</progress> 100%</h2>
 <p><strong>&copy; 2006 - 2024 | <a href=mailto:tpowa@archlinux.org>Tobias Powalowski</a></strong> | Arch Linux Developer <strong><a href="https://archlinux.org/people/developers/#tpowa">tpowa</a></strong><br>
-<strong>Last update: 14.08.2024 16:26</strong></p>
+<strong>Last update: 14.08.2024 22:42</strong></p>
 <nav id="TOC" role="doc-toc">
 <ul>
 <li><a href="#introduction" id="toc-introduction"><strong><span class="toc-section-number">1.</span> Introduction</strong></a></li>
@@ -448,7 +448,7 @@
 <ul>
 <li>You will be asked if you want to activate the <a href="https://wiki.archlinux.org/title/Testing" title="Testing"><strong>testing</strong></a> repositories <strong>&lt;default=no&gt;</strong>.</li>
 <li>Latest <a href="https://wiki.archlinux.org/title/Pacman" title="Pacman"><strong>pacman</strong></a> <a href="https://wiki.archlinux.org/title/Mirror" title="Mirror"><strong>mirrors</strong></a> will be <a href="http://ip-api.com" title="GeoIP"><strong>GeoIP</strong></a> synced and you have to select your <strong>favourite</strong> mirror.</li>
-<li>If a new kernel is online available, you can decide to load the latest archboot environment <strong>&lt;default=no&gt;</strong>.</li>
+<li>If a new kernel is online available, you can decide to load the latest Archboot Environment <strong>&lt;default=no&gt;</strong>.</li>
 </ul>
 <h3 data-number="3.5" id="interactive-launcher"><span class="header-section-number">3.5</span> <strong>Interactive Launcher</strong></h3>
 <ul>
@@ -637,7 +637,7 @@
 </table>
 <h3 data-number="3.12" id="system-configuration"><span class="header-section-number">3.12</span> System Configuration On Installed System</h3>
 <p>You can also run <strong>archboot-setup.sh</strong> for <strong>system configuration</strong> on an installed system.</p>
-<p><a href="#package-installation" title="Installation"><strong>Install</strong></a> your corresponding archboot package for getting the <strong>archboot-setup.sh</strong> script.</p>
+<p><a href="#package-installation" title="Installation"><strong>Install</strong></a> your corresponding Archboot package for getting the <strong>archboot-setup.sh</strong> script.</p>
 <h2 data-number="4." id="faq-known-issues-and-limitations"><span class="header-section-number">4.</span> <strong>FAQ / Known Issues / Limitations</strong></h2>
 <p>Please <strong>check</strong> the forum threads or project page for posted <strong>fixes</strong> and <strong>workarounds</strong>.</p>
 <table>
@@ -663,7 +663,7 @@ Some hardware does not like the <a href="https://wiki.archlinux.org/title/KMS" t
 </li>
 </ul>
 <ul>
-<li><strong>Package</strong> XYZ is <strong>missing</strong> in archboot environment.<br>
+<li><strong>Package</strong> XYZ is <strong>missing</strong> in Archboot Environment.<br>
 <a href="https://wiki.archlinux.org/title/Install" title="Install"><strong>Install</strong></a> the missing package as needed.
 For example, <a href="https://wiki.archlinux.org/title/Archinstall" title="Archinstall"><strong>archinstall</strong></a> is not included by default.<br>It needs python3, which is a large dependency.
 </li>
@@ -680,7 +680,7 @@ For example, <a href="https://wiki.archlinux.org/title/Archinstall" title="Archi
 </ul>
 <ul>
 <li><strong>UTM</strong> does not work with <strong>Apple virtualization</strong>.<br>
-The AARCH64 <strong>kernel </strong> does not seem to support this feature. This cannot be fixed on archboot side.
+The AARCH64 <strong>kernel </strong> does not seem to support this feature. This cannot be fixed on Archboot side.
 </li>
 </ul>
 <ul>
@@ -1045,7 +1045,7 @@ The calculated size to boot the image follows the formula:<br>
 <table>
 <thead>
 <tr class="header">
-<th>Create an archboot container for image creation:</th>
+<th>Create an Archboot container for image creation:</th>
 </tr>
 </thead>
 <tbody>
@@ -1074,7 +1074,7 @@ There are the following configuration files for ISO creation:
 <li><strong>/etc/archboot/&lt;profile&gt;.conf</strong>: contains the _KERNEL and the _HOOKS, which are used for the initrd.</li>
 </ul>
 <h4 data-number="7.2.3.3" id="archboot-cpio.sh"><span class="header-section-number">7.2.3.3</span> <strong>archboot-cpio.sh</strong></h4>
-The archboot initrd toolchain uses its <strong>own</strong> cpio generator. Some differences to other initcpio creators:
+The Archboot initramfs toolchain uses its <strong>own</strong> cpio generator. Some differences to other initcpio creators:
 <ul>
 <li><strong>objdump</strong> is used for library detection. It's faster than ldd!</li>
 <li>libraries for binaries outside of bin/ are <strong>not</strong> detected!</li>
@@ -1171,7 +1171,7 @@ Functions supported in <strong>/usr/lib/archboot/cpio/hooks/&lt;hook&gt;</strong
 </tbody>
 </table>
 <h4 data-number="7.2.3.4" id="archboot-x86_64-iso.sh"><span class="header-section-number">7.2.3.4</span> <strong>archboot-x86_64-iso.sh</strong></h4>
-<p>Script for image creation from running system or for use in archboot container.</p>
+<p>Script for image creation from running system or for use in Archboot container.</p>
 <table>
 <thead>
 <tr class="header">