diff --git a/usr/bin/archboot-network.sh b/usr/bin/archboot-network.sh index 0a9452f4c..71a58c6e5 100755 --- a/usr/bin/archboot-network.sh +++ b/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}" diff --git a/usr/bin/archboot-quickinst.sh b/usr/bin/archboot-quickinst.sh index 116daa0ee..fa0faf2f0 100755 --- a/usr/bin/archboot-quickinst.sh +++ b/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" diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh index d9026b4fe..ff9bdc505 100644 --- a/usr/lib/archboot/common.sh +++ b/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..." diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh index 07bae8704..2b24daab4 100644 --- a/usr/lib/archboot/container.sh +++ b/usr/lib/archboot/container.sh @@ -6,12 +6,12 @@ _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 "This will create an Archboot container for an Archboot image." echo echo "Options:" 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=\e[m Use containing archboot repository" + echo -e " \e[1m-install-source=\e[m Use containing Archboot repository" echo echo -e "Usage: \e[1m${_BASENAME} \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 } diff --git a/usr/lib/archboot/cpio/cpio.sh b/usr/lib/archboot/cpio/cpio.sh index 0a856c233..bd55092e4 100644 --- a/usr/lib/archboot/cpio/cpio.sh +++ b/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" diff --git a/usr/lib/archboot/cpio/hooks/base_common_system b/usr/lib/archboot/cpio/hooks/base_common_system index 12713cea3..35117cd65 100644 --- a/usr/lib/archboot/cpio/hooks/base_common_system +++ b/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 diff --git a/usr/lib/archboot/cpio/init.sh b/usr/lib/archboot/cpio/init.sh index 46285b183..95165d658 100755 --- a/usr/lib/archboot/cpio/init.sh +++ b/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 diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh index c6389b5da..e936d502c 100644 --- a/usr/lib/archboot/installer/pacman.sh +++ b/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" diff --git a/usr/lib/archboot/iso.sh b/usr/lib/archboot/iso.sh index cc42e8ff9..077216593 100644 --- a/usr/lib/archboot/iso.sh +++ b/usr/lib/archboot/iso.sh @@ -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}..." diff --git a/usr/lib/archboot/release.sh b/usr/lib/archboot/release.sh index 44a9b9b2f..5e6b2f4eb 100644 --- a/usr/lib/archboot/release.sh +++ b/usr/lib/archboot/release.sh @@ -20,7 +20,7 @@ _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 ." - echo "Optional: You can specify a certain with an archboot repository." + echo "Optional: You can specify a certain with an Archboot repository." echo "" echo -e "Usage: \e[1m${_BASENAME} \e[m" exit 0 diff --git a/usr/lib/archboot/repository.sh b/usr/lib/archboot/repository.sh index e9b2ca277..d96cf49f3 100644 --- a/usr/lib/archboot/repository.sh +++ b/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} \e[m" exit 0 diff --git a/usr/lib/archboot/server.sh b/usr/lib/archboot/server.sh index 6362c96fa..6c353fa82 100644 --- a/usr/lib/archboot/server.sh +++ b/usr/lib/archboot/server.sh @@ -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}" diff --git a/usr/lib/archboot/update/sway.sh b/usr/lib/archboot/update/sway.sh index 1629e3ed2..746c88d10 100644 --- a/usr/lib/archboot/update/sway.sh +++ b/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 <> /etc/xdg/foot/foot.ini -# archboot colors +# Archboot colors [colors] background=000000 foreground=ffffff diff --git a/usr/lib/archboot/update/xfce.sh b/usr/lib/archboot/update/xfce.sh index a1ded4443..72b770ee2 100644 --- a/usr/lib/archboot/update/xfce.sh +++ b/usr/lib/archboot/update/xfce.sh @@ -125,7 +125,7 @@ EOF echo "Setting breeze as default icons..." sd '' '' \ /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 diff --git a/usr/lib/systemd/system/archboot-server-update.service b/usr/lib/systemd/system/archboot-server-update.service index 4133f0b5a..79e12b9fe 100644 --- a/usr/lib/systemd/system/archboot-server-update.service +++ b/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 diff --git a/usr/share/archboot/base/etc/systemd/system/archboot-init.service b/usr/share/archboot/base/etc/systemd/system/archboot-init.service index 755fa4f4a..4ec27a3cb 100644 --- a/usr/share/archboot/base/etc/systemd/system/archboot-init.service +++ b/usr/share/archboot/base/etc/systemd/system/archboot-init.service @@ -2,7 +2,7 @@ # by Tobias Powalowski [Unit] -Description=Initializes archboot rootfs +Description=Initializes Archboot rootfs After=systemd-udev-trigger.service [Service] diff --git a/usr/share/archboot/doc/archboot.html b/usr/share/archboot/doc/archboot.html index 12c0cdc07..3d369e42f 100644 --- a/usr/share/archboot/doc/archboot.html +++ b/usr/share/archboot/doc/archboot.html @@ -448,7 +448,7 @@
  • You will be asked if you want to activate the testing repositories <default=no>.
  • Latest pacman mirrors will be GeoIP synced and you have to select your favourite mirror.
    • -
  • If a new kernel is online available, you can decide to load the latest archboot environment <default=no>.
    • +
  • If a new kernel is online available, you can decide to load the latest Archboot Environment <default=no>.

3.5 Interactive Launcher