Compare commits

..

6 commits

Author SHA1 Message Date
Tobias Powalowski
afd91ea3db fix missing space in title 2023-06-30 08:22:43 +02:00
Tobias Powalowski
41d692a4c1 rename update-installer to simple update 2023-06-30 07:30:44 +02:00
Tobias Powalowski
33f71917d9 update CHANGELOG 2023-06-30 07:27:21 +02:00
Tobias Powalowski
9fd789c4f2 update homepage 2023-06-30 07:25:00 +02:00
Tobias Powalowski
40f9e7b68b rename update-installer to simple update 2023-06-30 07:21:53 +02:00
Tobias Powalowski
c1187fb8fd rename update-installer to simple update 2023-06-30 07:20:04 +02:00
15 changed files with 44 additions and 43 deletions

View file

@ -32,9 +32,10 @@ Environment Changes:
- updated /etc/motd
- updated /etc/issue
- fixed /etc/os-release
update-installer.sh:
update-installer:
- updated messages on -full-system call
- updated elinks, chromium and firefox starting page to archboot.com
- rename update-installer.sh to update
setup:
- replaced findmnt -vno SOURCE with _FINDMNT
- replaced lsblk -rnpo with _LSBLK
@ -108,7 +109,7 @@ Environment changes:
- don't run kexec on local image, use systemd's switch_root instead
- added archboot-locale script for system wide locale switching
- readd kernel and /EFI to iso filesystem for virtualbox UEFI support
update-installer.sh:
update-installer:
- implemented free RAM detection for kexec tasks
km:
- removed main menu

View file

@ -5,12 +5,12 @@
. /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh
#shellcheck disable=SC1094
. /usr/lib/archboot/update-installer/update-installer.sh
. /usr/lib/archboot/update-installer/xfce.sh
. /usr/lib/archboot/update-installer/gnome.sh
. /usr/lib/archboot/update-installer/gnome-wayland.sh
. /usr/lib/archboot/update-installer/plasma.sh
. /usr/lib/archboot/update-installer/plasma-wayland.sh
. /usr/lib/archboot/update/update.sh
. /usr/lib/archboot/update/xfce.sh
. /usr/lib/archboot/update/gnome.sh
. /usr/lib/archboot/update/gnome-wayland.sh
. /usr/lib/archboot/update/plasma.sh
. /usr/lib/archboot/update/plasma-wayland.sh
[[ -z "${1}" ]] && usage
while [ $# -gt 0 ]; do
case ${1} in

View file

@ -102,8 +102,8 @@ _update_environment() {
echo -e "\e[93mGo and get a cup of coffee. Depending on your system setup,\e[m"
echo -e "\e[93myou can \e[1mstart\e[m\e[93m with your tasks in about \e[1m5\e[m\e[93m minutes...\e[m"
echo -e "\e[1mStarting\e[m assembling of archboot environment \e[1mwith\e[m package cache..."
echo -e "\e[1mRunning now: \e[92mupdate-installer -latest-install\e[m"
update-installer -latest-install
echo -e "\e[1mRunning now: \e[92mupdate -latest-install\e[m"
update -latest-install
fi
fi
fi

View file

@ -94,14 +94,14 @@ _enter_shell() {
_run_latest() {
echo -e "\e[1mStarting\e[m assembling of archboot environment \e[1mwithout\e[m package cache..."
echo -e "\e[1mRunning now: \e[92mupdate-installer -latest\e[m"
update-installer -latest | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>/dev/null
echo -e "\e[1mRunning now: \e[92mupdate -latest\e[m"
update -latest | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>/dev/null
}
_run_latest_install() {
echo -e "\e[1mStarting\e[m assembling of archboot environment \e[1mwith\e[m package cache..."
echo -e "\e[1mRunning now: \e[92mupdate-installer -latest-install\e[m"
update-installer -latest-install | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>/dev/null
echo -e "\e[1mRunning now: \e[92mupdate -latest-install\e[m"
update -latest-install | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>/dev/null
}
_run_update_installer() {
@ -133,9 +133,9 @@ _run_update_installer() {
fi
elif [[ "${TTY}" == "ttyS0" || "${TTY}" == "ttyAMA0" || "${TTY}" == "ttyUSB0" || "${TTY}" == "pts/0" ]]; then
if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 2571000 ]]; then
echo -e "Running \e[1m\e[92mupdate-installer -latest-install\e[m on \e[1mtty1\e[m, please wait...\e[m"
echo -e "Running \e[1m\e[92mupdate -latest-install\e[m on \e[1mtty1\e[m, please wait...\e[m"
else
echo -e "\e[1mRunning now: \e[92mupdate-installer -latest\e[m"
echo -e "\e[1mRunning now: \e[92mupdate -latest\e[m"
fi
echo -e "\e[1mProgress is shown here...\e[m"
fi

View file

@ -16,7 +16,7 @@ _INITRD="initrd.img"
_INST="/${_LIB}/installer"
_HELP="/${_LIB}/installer/help"
_RUN="/${_LIB}/run"
_UPDATE="/${_LIB}/update-installer"
_UPDATE="/${_LIB}/update"
[[ "${_RUNNING_ARCH}" == "x86_64" || "${_RUNNING_ARCH}" == "riscv64" ]] && _VMLINUZ="vmlinuz-linux"
[[ "${_RUNNING_ARCH}" == "aarch64" ]] && _VMLINUZ="Image"
@ -100,7 +100,7 @@ _download_latest() {
# helper binaries
echo -e "\e[1mStep 2/4:\e[m Downloading latest scripts..."
# main binaries
BINS="quickinst setup km tz update-installer copy-mountpoint rsync-backup restore-usbstick"
BINS="quickinst setup km tz update copy-mountpoint rsync-backup restore-usbstick"
for i in ${BINS}; do
[[ -e "${_BIN}/${i}" ]] && wget -q "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false" -O "${_BIN}/${i}"
done
@ -119,8 +119,8 @@ _download_latest() {
for i in ${LIBS}; do
wget -q "${_SOURCE}${_LIB}/${i}?inline=false" -O "${_LIB}/${i}"
done
# update-installer libs
LIBS="update-installer.sh xfce.sh gnome.sh gnome-wayland.sh plasma.sh plasma-wayland.sh"
# update libs
LIBS="update.sh xfce.sh gnome.sh gnome-wayland.sh plasma.sh plasma-wayland.sh"
for i in ${LIBS}; do
wget -q "${_SOURCE}${_UPDATE}/${i}?inline=false" -O "${_UPDATE}/${i}"
done
@ -151,10 +151,10 @@ _network_check() {
}
_update_installer_check() {
if [[ -f /.update-installer ]]; then
if [[ -f /.update ]]; then
echo -e "\e[91mAborting:\e[m"
echo "update-installer is already running on other tty..."
echo "If you are absolutly sure it's not running, you need to remove /.update-installer"
echo "update is already running on other tty..."
echo "If you are absolutly sure it's not running, you need to remove /.update"
exit 1
fi
if ! [[ -e /var/cache/pacman/pkg/archboot.db ]]; then
@ -338,7 +338,7 @@ _prepare_graphic() {
_new_environment() {
_update_installer_check
touch /.update-installer
touch /.update
_kill_w_dir
_STEPS="10"
_S_APPEND="0"

View file

@ -7,8 +7,8 @@ build ()
map add_file "/etc/archboot/defaults" "/usr/lib/archboot/common.sh" \
"/usr/lib/archboot/container.sh" "/usr/bin/archboot-$(uname -m)-create-container.sh" \
"/usr/lib/archboot/login.sh" "/usr/lib/archboot/cpio.sh" "/usr/bin/archboot-cpio.sh"
add_full_dir "/usr/lib/archboot/update-installer"
add_file "/usr/bin/archboot-update-installer.sh" "/usr/bin/update-installer"
add_full_dir "/usr/lib/archboot/update"
add_file "/usr/bin/archboot-update.sh" "/usr/bin/update"
add_file "/usr/share/archboot/gpg/tpowa.gpg"
# use /etc/profile to launch login.sh
echo ". /usr/lib/archboot/login.sh" >> ${BUILDROOT}/root/.bashrc

View file

@ -29,7 +29,7 @@ if echo "${HOOKS[@]}" | grep -qw archboot_net; then
fi
if echo "${HOOKS[@]}" | grep -qw archboot_installer; then
echo -e "\e[1mManage Archboot Environment:\e[m" >> "${MOTD}"
echo -e " - Use the \e[1;92m'update-installer'\e[m script." >> "${MOTD}"
echo -e " - Use the \e[1;92m'update'\e[m script." >> "${MOTD}"
#shellcheck disable=SC2129
echo -e "\e[1mInstallation:\e[m" >> "${MOTD}"
echo -e " - Use the \e[92m'setup'\e[m script." >> "${MOTD}"

View file

@ -14,7 +14,7 @@
<body>
<p><span><img src="/web/logo.png" alt="Logo"></span></p>
<h1>Archboot Project | <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=Z7GXKW4MKHK7C"><img src="/web/donate.png" alt="Donate"></a></h1>
<p><strong>&copy; 2006 - 2023 | <a href=mailto:tpowa@archlinux.org>Tobias Powalowski</a></strong><br>Arch Linux Developer <strong><a href="https://archlinux.org/people/developers/#tpowa">tpowa</a><br>Last update: 26.06.2023 10:43</strong></p>
<p><strong>&copy; 2006 - 2023 | <a href=mailto:tpowa@archlinux.org>Tobias Powalowski</a></strong><br>Arch Linux Developer <strong><a href="https://archlinux.org/people/developers/#tpowa">tpowa</a><br>Last update: 30.06.2023 07:24</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>
@ -399,23 +399,23 @@ initrd (loop)/boot/initramfs-x86_64.img
<tbody>
<tr class="odd">
<td><a href="https://wiki.archlinux.org/title/Gnome" title="Gnome"><strong>Gnome</strong></a></td>
<td><code># update-installer -gnome</code></td>
<td><code># update -gnome</code></td>
</tr>
<tr class="even">
<td><a href="https://wiki.archlinux.org/title/Gnome" title="Gnome"><strong>Gnome</strong></a> <a href="https://wiki.archlinux.org/title/Wayland" title="Wayland"><strong>Wayland</strong></a></td>
<td><code># update-installer -gnome-wayland</code></td>
<td><code># update -gnome-wayland</code></td>
</tr>
<tr class="odd">
<td><a href="https://wiki.archlinux.org/title/KDE_Plasma" title="KDE Plasma"><strong>KDE Plasma</strong></a></td>
<td><code># update-installer -plasma</code></td>
<td><code># update -plasma</code></td>
</tr>
<tr class="even">
<td><a href="https://wiki.archlinux.org/title/KDE_Plasma" title="KDE Plasma"><strong>KDE Plasma</strong></a> <a href="https://wiki.archlinux.org/title/Wayland" title="Wayland"><strong>Wayland</strong></a></td>
<td><code># update-installer -plasma-wayland</code></td>
<td><code># update -plasma-wayland</code></td>
</tr>
<tr class="odd">
<td><a href="https://wiki.archlinux.org/title/Xfce" title="Xfce"><strong>Xfce</strong></a></td>
<td><code># update-installer -xfce</code></td>
<td><code># update -xfce</code></td>
</tr>
</tbody>
</table>
@ -439,11 +439,11 @@ initrd (loop)/boot/initramfs-x86_64.img
<tbody>
<tr class="odd">
<td><code>_CUSTOM_XORG</code></td>
<td><code># update-installer -custom-xorg</code></td>
<td><code># update -custom-xorg</code></td>
</tr>
<tr class="even">
<td><code>_CUSTOM_WAYLAND</code></td>
<td><code># update-installer -custom-wayland</code></td>
<td><code># update -custom-wayland</code></td>
</tr>
</tbody>
</table>
@ -553,11 +553,11 @@ initrd (loop)/boot/initramfs-x86_64.img
</thead>
<tbody>
<tr class="odd">
<td><code># update-installer -full-system</code></td>
<td><code># update -full-system</code></td>
</tr>
</tbody>
</table>
<p>This will also <strong>stop</strong> cleaning the system, while running other <strong><code>update-installer</code></strong> tasks.</p>
<p>This will also <strong>stop</strong> cleaning the system, while running other <strong><code>update</code></strong> tasks.</p>
<h3 data-number="3.5" id="interactive-setup"><span class="header-section-number">3.5</span> <strong>Interactive Setup</strong></h3>
<p>You can run each point for doing the mentioned task. If you do a fresh install, it is recommended to run each point in the order as presented.</p>
<h4 data-number="3.5.1" id="changing-keymap-and-console-fonts"><span class="header-section-number">3.5.1</span> <strong>Configure Console</strong></h4>
@ -641,7 +641,7 @@ initrd (loop)/boot/initramfs-x86_64.img
</thead>
<tbody>
<tr class="odd">
<td><code># update-installer -help</code></td>
<td><code># update -help</code></td>
</tr>
</tbody>
</table>
@ -704,7 +704,7 @@ initrd (loop)/boot/initramfs-x86_64.img
</thead>
<tbody>
<tr class="odd">
<td><code># update-installer -update</code></td>
<td><code># update -update</code></td>
</tr>
</tbody>
</table>

View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
# created by Tobias Powalowski <tpowa@archlinux.org>
_update_installer()
_update()
{
local cur prev OPTS
COMPREPLY=()
@ -13,7 +13,7 @@ _update_installer()
esac
case $cur in
*)
OPTS="$(update-installer | grep '\-[a-z]' | cut -d ' ' -f2 | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g")"
OPTS="$(update | grep '\-[a-z]' | cut -d ' ' -f2 | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g")"
COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
return 0
;;
@ -21,4 +21,4 @@ _update_installer()
compopt -o bashdefault -o default
return 0
}
complete -F _update_installer update-installer
complete -F _update update