root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 12:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

rename update-installer.sh to update-installer on install environment

Browse source
This commit is contained in:
Tobias Powalowski 2022-06-21 07:17:04 +02:00
parent 3b4ed69bb6
commit 6312fd9cbb
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/archboot/installer/pacman.sh
View file

@ -84,8 +84,8 @@ update_environment() {
if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt "2571000" ]]; then
DIALOG --defaultno --yesno "Do you want to update the archboot environment to latest packages with caching packages for installation?\n\nATTENTION:\nThis will reboot the system using kexec!" 0 0 && UPDATE_ENVIRONMENT="1"
if [[ "${UPDATE_ENVIRONMENT}" == "1" ]]; then
DIALOG --infobox "Now setting up new archboot environment and dowloading latest packages.\n\nRunning at the moment: update-installer.sh -latest-install\nCheck ${VC} console (ALT-F${VC_NUM}) for progress...\n\nGet a cup of coffee ...\nDepending on your system's setup, this needs about 5 minutes.\nPlease be patient." 0 0
/usr/bin/update-installer.sh -latest-install > "${LOG}" 2>&1
DIALOG --infobox "Now setting up new archboot environment and dowloading latest packages.\n\nRunning at the moment: update-installer -latest-install\nCheck ${VC} console (ALT-F${VC_NUM}) for progress...\n\nGet a cup of coffee ...\nDepending on your system's setup, this needs about 5 minutes.\nPlease be patient." 0 0
/usr/bin/update-installer -latest-install > "${LOG}" 2>&1
fi
fi
fi

12
usr/lib/archboot/login.sh
View file

@ -24,13 +24,13 @@ _enter_shell() {
}
_run_latest() {
echo -e "\033[1mRunning now: \033[92mupdate-installer.sh -latest\033[0m"
update-installer.sh -latest | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>/dev/null
echo -e "\033[1mRunning now: \033[92mupdate-installer -latest\033[0m"
update-installer -latest | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>/dev/null
}
_run_latest_install() {
echo -e "\033[1mRunning now: \033[92mupdate-installer.sh -latest-install\033[0m"
update-installer.sh -latest-install | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>/dev/null
echo -e "\033[1mRunning now: \033[92mupdate-installer -latest-install\033[0m"
update-installer -latest-install | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>/dev/null
}
_run_update_installer() {
@ -65,9 +65,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 \033[1m\033[92mupdate-installer.sh -latest-install\033[0m on \033[1mtty1\033[0m, please wait ...\033[0m"
echo -e "Running \033[1m\033[92mupdate-installer -latest-install\033[0m on \033[1mtty1\033[0m, please wait ...\033[0m"
else
echo -e "\033[1mRunning now: \033[92mupdate-installer.sh -latest\033[0m"
echo -e "\033[1mRunning now: \033[92mupdate-installer -latest\033[0m"
fi
echo -e "\033[1mProgress is shown here ...\033[0m"
fi

6
usr/lib/archboot/update-installer.sh
View file

@ -101,12 +101,12 @@ _download_latest() {
wget -q "${_SOURCE}${_ETC}/defaults?inline=false" -O "${_ETC}/defaults"
BINS="copy-mountpoint.sh rsync-backup.sh restore-usbstick.sh \
${_RUNNING_ARCH}-create-container.sh ${_RUNNING_ARCH}-release.sh \
binary-check.sh update-installer.sh secureboot-keys.sh mkkeys.sh"
binary-check.sh secureboot-keys.sh mkkeys.sh"
for i in ${BINS}; do
[[ -e "${_BIN}/${i}" ]] && wget -q "${_SOURCE}${_BIN}/archboot-${i}?inline=false" -O "${_BIN}/${i}"
[[ -e "${_BIN}/archboot-${i}" ]] && wget -q "${_SOURCE}${_BIN}/archboot-${i}?inline=false" -O "${_BIN}/archboot-${i}"
done
BINS="quickinst setup km tz"
BINS="quickinst setup km tz update-installer"
for i in ${BINS}; do
[[ -e "${_BIN}/${i}" ]] && wget -q "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false" -O "${_BIN}/${i}"
done
@ -127,7 +127,7 @@ _download_latest() {
_update_installer_check() {
if [[ -f /.update-installer ]]; then
echo -e "\033[91mAborting:\033[0m"
echo "update-installer.sh is already running on other tty ..."
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"
exit 1
fi

2
usr/lib/initcpio/install/archboot_installer_common
View file

@ -8,7 +8,7 @@ build ()
"/usr/lib/archboot/update-installer.sh" "/usr/lib/archboot/xfce.sh" \
"/usr/lib/archboot/plasma.sh" "/usr/lib/archboot/plasma-wayland.sh" "/usr/lib/archboot/gnome.sh" \
"/usr/lib/archboot/gnome-wayland.sh" "/usr/lib/archboot/login.sh"
add_file "/usr/bin/archboot-update-installer.sh" "/usr/bin/update-installer.sh"
add_file "/usr/bin/archboot-update-installer.sh" "/usr/bin/update-installer"
add_file "/usr/share/archboot/gpg/tpowa.gpg"
add_symlink "/etc/profile.d/zz-archboot-login.sh" "/usr/lib/archboot/login.sh"
}

2
usr/lib/initcpio/install/archboot_motd
View file

@ -32,7 +32,7 @@ if echo "${HOOKS[@]}" | grep -qw archboot_installer; then
echo -e " - On first login \033[1msetup\033[0m is launched automatically." >> "${MOTD}"
echo -e " - Please run \033[1m\033[92m'setup'\033[0m again to install Arch Linux if you left setup." >> "${MOTD}"
echo -e " - Virtual console \033[1m7\033[0m is used for setup logging, use \033[1m\033[92mALT + F7\033[0m." >> "${MOTD}"
echo -e " - Run \033[1m\033[92m'update-installer.sh'\033[0m to get all update options of the installer." >> "${MOTD}"
echo -e " - Run \033[1m\033[92m'update-installer'\033[0m to get all update options of the installer." >> "${MOTD}"
echo -e "\033[1mFor Experts:\033[0m" >> "${MOTD}"
echo -e " - Use \033[1m\033[92m'quickinst'\033[0m to install and bypass the setup routine." >> "${MOTD}"
fi