forked from pool/gnome-branding-Aeon
- Wait for network for all aeon-mig-firstboot tasks
OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/gnome-branding-Aeon?expand=0&rev=19
This commit is contained in:
parent
403910266d
commit
34b43ac08f
@ -23,6 +23,10 @@ installFlatpakPackage(){
|
||||
fi
|
||||
}
|
||||
|
||||
waitforNet(){
|
||||
until /usr/bin/curl -s --max-time 5 https://flathub.org > /dev/null; do sleep 1; done
|
||||
}
|
||||
|
||||
defaultOptions() {
|
||||
pkgs=("org.mozilla.firefox" "org.gnome.Calculator" "org.gnome.TextEditor")
|
||||
}
|
||||
@ -100,7 +104,7 @@ show_progress() {
|
||||
(
|
||||
sleep 1
|
||||
echo "# Waiting for Internet connection"
|
||||
until /usr/bin/curl -s --max-time 5 https://flathub.org > /dev/null; do sleep 1; done
|
||||
waitforNet
|
||||
while /usr/bin/pgrep -f '/usr/bin/flatpak|/usr/sbin/transactional-update|/usr/bin/pkexec' >/dev/null; do
|
||||
echo "# Installing Packages"
|
||||
sleep 1
|
||||
@ -125,7 +129,7 @@ install_locale() {
|
||||
}
|
||||
|
||||
run_tasks() {
|
||||
until /usr/bin/curl -s --max-time 5 https://flathub.org > /dev/null; do sleep 1; done
|
||||
waitforNet
|
||||
if [[ -n "${need_locale}" ]]; then
|
||||
install_locale &
|
||||
fi
|
||||
|
@ -11,7 +11,7 @@ show_progress() {
|
||||
(
|
||||
sleep 1
|
||||
echo "# Waiting for Internet connection"
|
||||
until /usr/bin/curl -s --max-time 5 https://flathub.org > /dev/null; do sleep 1; done
|
||||
waitforNet
|
||||
while /usr/bin/pgrep -f '/usr/bin/flatpak|/usr/sbin/transactional-update|/usr/bin/pkexec' >/dev/null; do
|
||||
echo "# Tuning Installation"
|
||||
sleep 1
|
||||
@ -20,7 +20,7 @@ show_progress() {
|
||||
}
|
||||
|
||||
installFlatpakRepo(){
|
||||
until /usr/bin/curl -s --max-time 5 https://flathub.org > /dev/null; do sleep 1; done
|
||||
waitforNet
|
||||
/usr/bin/flatpak remote-add --user --if-not-exists flathub /usr/share/aeon/flathub.flatpakrepo
|
||||
if [ "$?" != 0 ] ; then
|
||||
zenity --error \
|
||||
@ -30,6 +30,7 @@ installFlatpakRepo(){
|
||||
}
|
||||
|
||||
install_locale() {
|
||||
waitforNet
|
||||
pkexec sh -c "/usr/sbin/transactional-update -n run zypper -n aloc ${LANG} && /usr/sbin/transactional-update -n apply"
|
||||
if [ "$?" != 0 ] ; then
|
||||
zenity --error \
|
||||
@ -46,6 +47,10 @@ lastMSG() {
|
||||
rm ~/.config/autostart/aeon-mig-firstboot.desktop
|
||||
}
|
||||
|
||||
waitforNet(){
|
||||
until /usr/bin/curl -s --max-time 5 https://flathub.org > /dev/null; do sleep 1; done
|
||||
}
|
||||
|
||||
firstMSG
|
||||
installFlatpakRepo &
|
||||
if [[ ! "${LANG}" =~ ^en_ ]]; then
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 23 20:00:38 UTC 2024 - Richard Brown <rbrown@suse.com>
|
||||
|
||||
- Wait for network for all aeon-mig-firstboot tasks
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 23 16:05:53 UTC 2024 - Richard Brown <rbrown@suse.com>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user