mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
move update-installer common functions to update-installer
This commit is contained in:
Tobias Powalowski
parent
18dc701a2c
commit
62b2bb241f
2 changed files with 110 additions and 110 deletions
|
|
@ -168,113 +168,3 @@ _cachedir_check() {
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
_prepare_gnome() {
|
|
||||||
if ! [[ -e /usr/bin/gnome-session ]]; then
|
|
||||||
echo -e "\033[1mStep 1/3:\033[0m Installing GNOME desktop now ..."
|
|
||||||
echo " This will need some time ..."
|
|
||||||
_prepare_graphic "${_PACKAGES}" >/dev/tty7 2>&1
|
|
||||||
echo -e "\033[1mStep 2/3:\033[0m Configuring GNOME desktop ..."
|
|
||||||
_configure_gnome >/dev/tty7 2>&1
|
|
||||||
systemd-sysusers >/dev/tty7 2>&1
|
|
||||||
systemd-tmpfiles --create >/dev/tty7 2>&1
|
|
||||||
else
|
|
||||||
echo -e "\033[1mStep 1/3:\033[0m Installing GNOME desktop already done ..."
|
|
||||||
echo -e "\033[1mStep 2/3:\033[0m Configuring GNOME desktop already done ..."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_prepare_plasma() {
|
|
||||||
if ! [[ -e /usr/bin/startplasma-x11 ]]; then
|
|
||||||
echo -e "\033[1mStep 1/3:\033[0m Installing KDE/Plasma desktop now ..."
|
|
||||||
echo " This will need some time ..."
|
|
||||||
_prepare_graphic "${_PACKAGES}" >/dev/tty7 2>&1
|
|
||||||
echo -e "\033[1mStep 2/3:\033[0m Configuring KDE desktop ..."
|
|
||||||
_configure_plasma >/dev/tty7 2>&1
|
|
||||||
else
|
|
||||||
echo -e "\033[1mStep 1/3:\033[0m Installing KDE/Plasma desktop already done ..."
|
|
||||||
echo -e "\033[1mStep 2/3:\033[0m Configuring KDE desktop already done ..."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_configure_gnome() {
|
|
||||||
echo "Configuring Gnome ..."
|
|
||||||
[[ "${_STANDARD_BROWSER}" == "firefox" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'firefox.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']"
|
|
||||||
[[ "${_STANDARD_BROWSER}" == "chromium" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'chromium.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']"
|
|
||||||
echo "Setting wallpaper ..."
|
|
||||||
gsettings set org.gnome.desktop.background picture-uri file:////usr/share/archboot/grub/archboot-background.png
|
|
||||||
echo "Autostarting setup ..."
|
|
||||||
cat << EOF > /etc/xdg/autostart/archboot.desktop
|
|
||||||
[Desktop Entry]
|
|
||||||
Type=Application
|
|
||||||
Name=Archboot Setup
|
|
||||||
GenericName=Installer
|
|
||||||
Exec=gnome-terminal -- /usr/bin/setup
|
|
||||||
Icon=system-software-install
|
|
||||||
EOF
|
|
||||||
cp /etc/xdg/autostart/archboot.desktop /usr/share/applications/
|
|
||||||
_HIDE_MENU="avahi-discover bssh bvnc org.gnome.Extensions org.gnome.FileRoller org.gnome.gThumb org.gnome.gedit fluid vncviewer qvidcap qv4l2"
|
|
||||||
echo "Hiding ${_HIDE_MENU} menu entries ..."
|
|
||||||
for i in ${_HIDE_MENU}; do
|
|
||||||
echo "[DESKTOP ENTRY]" > /usr/share/applications/"${i}".desktop
|
|
||||||
echo 'NoDisplay=true' >> /usr/share/applications/"${i}".desktop
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
_configure_plasma() {
|
|
||||||
echo "Configuring KDE ..."
|
|
||||||
sed -i -e 's#<default>applications:.*#<default>applications:systemsettings.desktop,applications:org.kde.konsole.desktop,preferred://filemanager,preferred://browser,applications:gparted.desktop,applications:archboot.desktop</default>#g' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml
|
|
||||||
echo "Replacing wallpaper ..."
|
|
||||||
for i in /usr/share/wallpapers/Next/contents/images/*; do
|
|
||||||
cp /usr/share/archboot/grub/archboot-background.png "${i}"
|
|
||||||
done
|
|
||||||
echo "Replacing menu structure ..."
|
|
||||||
cat << EOF >/etc/xdg/menus/applications.menu
|
|
||||||
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
|
|
||||||
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
|
|
||||||
|
|
||||||
<Menu>
|
|
||||||
<Name>Applications</Name>
|
|
||||||
<Directory>kde-main.directory</Directory>
|
|
||||||
<!-- Search the default locations -->
|
|
||||||
<DefaultAppDirs/>
|
|
||||||
<DefaultDirectoryDirs/>
|
|
||||||
<DefaultLayout>
|
|
||||||
<Merge type="files"/>
|
|
||||||
<Merge type="menus"/>
|
|
||||||
<Separator/>
|
|
||||||
<Menuname>More</Menuname>
|
|
||||||
</DefaultLayout>
|
|
||||||
<Layout>
|
|
||||||
<Merge type="files"/>
|
|
||||||
<Merge type="menus"/>
|
|
||||||
<Menuname>Applications</Menuname>
|
|
||||||
</Layout>
|
|
||||||
<Menu>
|
|
||||||
<Name>Settingsmenu</Name>
|
|
||||||
<Directory>kf5-settingsmenu.directory</Directory>
|
|
||||||
<Include>
|
|
||||||
<Category>Settings</Category>
|
|
||||||
</Include>
|
|
||||||
</Menu>
|
|
||||||
<DefaultMergeDirs/>
|
|
||||||
<Include>
|
|
||||||
<Filename>archboot.desktop</Filename>
|
|
||||||
<Filename>${_STANDARD_BROWSER}.desktop</Filename>
|
|
||||||
<Filename>org.kde.dolphin.desktop</Filename>
|
|
||||||
<Filename>gparted.desktop</Filename>
|
|
||||||
<Filename>org.kde.konsole.desktop</Filename>
|
|
||||||
</Include>
|
|
||||||
</Menu>
|
|
||||||
EOF
|
|
||||||
echo "Autostarting setup ..."
|
|
||||||
cat << EOF > /etc/xdg/autostart/archboot.desktop
|
|
||||||
[Desktop Entry]
|
|
||||||
Type=Application
|
|
||||||
Name=Archboot Setup
|
|
||||||
GenericName=Installer
|
|
||||||
Exec=konsole -p colors=Linux -e /usr/bin/setup
|
|
||||||
Icon=system-software-install
|
|
||||||
EOF
|
|
||||||
cp /etc/xdg/autostart/archboot.desktop /usr/share/applications/
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -557,3 +557,113 @@ Name=Tigervnc
|
||||||
Exec=x0vncserver -rfbauth /etc/tigervnc/passwd
|
Exec=x0vncserver -rfbauth /etc/tigervnc/passwd
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_prepare_gnome() {
|
||||||
|
if ! [[ -e /usr/bin/gnome-session ]]; then
|
||||||
|
echo -e "\033[1mStep 1/3:\033[0m Installing GNOME desktop now ..."
|
||||||
|
echo " This will need some time ..."
|
||||||
|
_prepare_graphic "${_PACKAGES}" >/dev/tty7 2>&1
|
||||||
|
echo -e "\033[1mStep 2/3:\033[0m Configuring GNOME desktop ..."
|
||||||
|
_configure_gnome >/dev/tty7 2>&1
|
||||||
|
systemd-sysusers >/dev/tty7 2>&1
|
||||||
|
systemd-tmpfiles --create >/dev/tty7 2>&1
|
||||||
|
else
|
||||||
|
echo -e "\033[1mStep 1/3:\033[0m Installing GNOME desktop already done ..."
|
||||||
|
echo -e "\033[1mStep 2/3:\033[0m Configuring GNOME desktop already done ..."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
_prepare_plasma() {
|
||||||
|
if ! [[ -e /usr/bin/startplasma-x11 ]]; then
|
||||||
|
echo -e "\033[1mStep 1/3:\033[0m Installing KDE/Plasma desktop now ..."
|
||||||
|
echo " This will need some time ..."
|
||||||
|
_prepare_graphic "${_PACKAGES}" >/dev/tty7 2>&1
|
||||||
|
echo -e "\033[1mStep 2/3:\033[0m Configuring KDE desktop ..."
|
||||||
|
_configure_plasma >/dev/tty7 2>&1
|
||||||
|
else
|
||||||
|
echo -e "\033[1mStep 1/3:\033[0m Installing KDE/Plasma desktop already done ..."
|
||||||
|
echo -e "\033[1mStep 2/3:\033[0m Configuring KDE desktop already done ..."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
_configure_gnome() {
|
||||||
|
echo "Configuring Gnome ..."
|
||||||
|
[[ "${_STANDARD_BROWSER}" == "firefox" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'firefox.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']"
|
||||||
|
[[ "${_STANDARD_BROWSER}" == "chromium" ]] && gsettings set org.gnome.shell favorite-apps "['org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'chromium.desktop', 'org.gnome.DiskUtility.desktop', 'gparted.desktop', 'archboot.desktop']"
|
||||||
|
echo "Setting wallpaper ..."
|
||||||
|
gsettings set org.gnome.desktop.background picture-uri file:////usr/share/archboot/grub/archboot-background.png
|
||||||
|
echo "Autostarting setup ..."
|
||||||
|
cat << EOF > /etc/xdg/autostart/archboot.desktop
|
||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=Archboot Setup
|
||||||
|
GenericName=Installer
|
||||||
|
Exec=gnome-terminal -- /usr/bin/setup
|
||||||
|
Icon=system-software-install
|
||||||
|
EOF
|
||||||
|
cp /etc/xdg/autostart/archboot.desktop /usr/share/applications/
|
||||||
|
_HIDE_MENU="avahi-discover bssh bvnc org.gnome.Extensions org.gnome.FileRoller org.gnome.gThumb org.gnome.gedit fluid vncviewer qvidcap qv4l2"
|
||||||
|
echo "Hiding ${_HIDE_MENU} menu entries ..."
|
||||||
|
for i in ${_HIDE_MENU}; do
|
||||||
|
echo "[DESKTOP ENTRY]" > /usr/share/applications/"${i}".desktop
|
||||||
|
echo 'NoDisplay=true' >> /usr/share/applications/"${i}".desktop
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
_configure_plasma() {
|
||||||
|
echo "Configuring KDE ..."
|
||||||
|
sed -i -e 's#<default>applications:.*#<default>applications:systemsettings.desktop,applications:org.kde.konsole.desktop,preferred://filemanager,preferred://browser,applications:gparted.desktop,applications:archboot.desktop</default>#g' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml
|
||||||
|
echo "Replacing wallpaper ..."
|
||||||
|
for i in /usr/share/wallpapers/Next/contents/images/*; do
|
||||||
|
cp /usr/share/archboot/grub/archboot-background.png "${i}"
|
||||||
|
done
|
||||||
|
echo "Replacing menu structure ..."
|
||||||
|
cat << EOF >/etc/xdg/menus/applications.menu
|
||||||
|
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
|
||||||
|
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
|
||||||
|
|
||||||
|
<Menu>
|
||||||
|
<Name>Applications</Name>
|
||||||
|
<Directory>kde-main.directory</Directory>
|
||||||
|
<!-- Search the default locations -->
|
||||||
|
<DefaultAppDirs/>
|
||||||
|
<DefaultDirectoryDirs/>
|
||||||
|
<DefaultLayout>
|
||||||
|
<Merge type="files"/>
|
||||||
|
<Merge type="menus"/>
|
||||||
|
<Separator/>
|
||||||
|
<Menuname>More</Menuname>
|
||||||
|
</DefaultLayout>
|
||||||
|
<Layout>
|
||||||
|
<Merge type="files"/>
|
||||||
|
<Merge type="menus"/>
|
||||||
|
<Menuname>Applications</Menuname>
|
||||||
|
</Layout>
|
||||||
|
<Menu>
|
||||||
|
<Name>Settingsmenu</Name>
|
||||||
|
<Directory>kf5-settingsmenu.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<Category>Settings</Category>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<DefaultMergeDirs/>
|
||||||
|
<Include>
|
||||||
|
<Filename>archboot.desktop</Filename>
|
||||||
|
<Filename>${_STANDARD_BROWSER}.desktop</Filename>
|
||||||
|
<Filename>org.kde.dolphin.desktop</Filename>
|
||||||
|
<Filename>gparted.desktop</Filename>
|
||||||
|
<Filename>org.kde.konsole.desktop</Filename>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
EOF
|
||||||
|
echo "Autostarting setup ..."
|
||||||
|
cat << EOF > /etc/xdg/autostart/archboot.desktop
|
||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=Archboot Setup
|
||||||
|
GenericName=Installer
|
||||||
|
Exec=konsole -p colors=Linux -e /usr/bin/setup
|
||||||
|
Icon=system-software-install
|
||||||
|
EOF
|
||||||
|
cp /etc/xdg/autostart/archboot.desktop /usr/share/applications/
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue