update build script
This commit is contained in:
parent
70c119523d
commit
9b69ea7028
|
@ -16,7 +16,7 @@ usage() {
|
||||||
Usage: $PROGNAME [options ...] [-- mklive options ...]
|
Usage: $PROGNAME [options ...] [-- mklive options ...]
|
||||||
|
|
||||||
Wrapper script around mklive.sh for several standard flavors of live images.
|
Wrapper script around mklive.sh for several standard flavors of live images.
|
||||||
Adds void-installer and other helpful utilities to the generated images.
|
Adds pep-installer and other helpful utilities to the generated images.
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-a <arch> Set XBPS_ARCH in the image
|
-a <arch> Set XBPS_ARCH in the image
|
||||||
|
@ -71,7 +71,7 @@ setup_pipewire() {
|
||||||
build_variant() {
|
build_variant() {
|
||||||
variant="$1"
|
variant="$1"
|
||||||
shift
|
shift
|
||||||
IMG=void-live-${ARCH}-${DATE}-${variant}.iso
|
IMG=pep-live-${ARCH}-${DATE}-${variant}.iso
|
||||||
GRUB_PKGS="grub-i386-efi grub-x86_64-efi"
|
GRUB_PKGS="grub-i386-efi grub-x86_64-efi"
|
||||||
A11Y_PKGS="espeakup void-live-audio brltty"
|
A11Y_PKGS="espeakup void-live-audio brltty"
|
||||||
PKGS="dialog octoxbps cryptsetup lvm2 mdadm void-docs-browse xtools-minimal xmirror chrony $A11Y_PKGS $GRUB_PKGS"
|
PKGS="dialog octoxbps cryptsetup lvm2 mdadm void-docs-browse xtools-minimal xmirror chrony $A11Y_PKGS $GRUB_PKGS"
|
||||||
|
@ -91,7 +91,7 @@ build_variant() {
|
||||||
;;
|
;;
|
||||||
xfce)
|
xfce)
|
||||||
PKGS="$PKGS $XORG_PKGS lightdm lightdm-gtk3-greeter xfce4 gnome-themes-standard gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox xfce4-pulseaudio-plugin mousepad mugshot menulibre thunar-archive-plugin thunar-volman xfce4-battery-plugin xfce4-clipman-plugin xfce4-power-manager xfce4-taskmanager xfce4-terminal xfce4-whiskermenu-plugin xarchiver alsa-utils bluez btop console-setup cups curl dconf-editor dbus-x11 cantarell-fonts liberation-fonts-ttf git wget gnome-disk-utility gparted gvfs samba avahi inxi network-manager-applet ntp python3-pip python3-pipx python3-tkinter python3-Pillow system-config-printer simple-scan smartmontools smbclient spice-vdagent sqlite openssh"
|
PKGS="$PKGS $XORG_PKGS lightdm lightdm-gtk3-greeter xfce4 gnome-themes-standard gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox xfce4-pulseaudio-plugin mousepad mugshot menulibre thunar-archive-plugin thunar-volman xfce4-battery-plugin xfce4-clipman-plugin xfce4-power-manager xfce4-taskmanager xfce4-terminal xfce4-whiskermenu-plugin xarchiver alsa-utils bluez btop console-setup cups curl dconf-editor dbus-x11 cantarell-fonts liberation-fonts-ttf git wget gnome-disk-utility gparted gvfs samba avahi inxi network-manager-applet ntp python3-pip python3-pipx python3-tkinter python3-Pillow system-config-printer simple-scan smartmontools smbclient spice-vdagent sqlite openssh"
|
||||||
SERVICES="$SERVICES dbus lightdm NetworkManager polkitd bluetoothd cupsd avahi-daemon udisksd upowerd ntpd smbd nmbd spice-vdagentd"
|
SERVICES="$SERVICES dbus lightdm NetworkManager polkitd bluetoothd cupsd avahi-daemon ntpd smbd nmbd sshd spice-vdagentd"
|
||||||
LIGHTDM_SESSION=xfce
|
LIGHTDM_SESSION=xfce
|
||||||
;;
|
;;
|
||||||
mate)
|
mate)
|
||||||
|
@ -155,7 +155,7 @@ if [ -x installer.sh ]; then
|
||||||
MKLIVE_VERSION="$(PROGNAME='' version)"
|
MKLIVE_VERSION="$(PROGNAME='' version)"
|
||||||
installer=$(mktemp)
|
installer=$(mktemp)
|
||||||
sed "s/@@MKLIVE_VERSION@@/${MKLIVE_VERSION}/" installer.sh > "$installer"
|
sed "s/@@MKLIVE_VERSION@@/${MKLIVE_VERSION}/" installer.sh > "$installer"
|
||||||
install -Dm755 "$installer" "$INCLUDEDIR"/usr/bin/void-installer
|
install -Dm755 "$installer" "$INCLUDEDIR"/usr/bin/pep-installer
|
||||||
rm "$installer"
|
rm "$installer"
|
||||||
else
|
else
|
||||||
echo installer.sh not found >&2
|
echo installer.sh not found >&2
|
||||||
|
@ -176,7 +176,7 @@ fi
|
||||||
|
|
||||||
move_isos() {
|
move_isos() {
|
||||||
echo "Movendo as ISOs para /var/www/html..."
|
echo "Movendo as ISOs para /var/www/html..."
|
||||||
mv void-live-${ARCH}-${DATE}-*.iso /var/www/html/ || { echo "Erro ao mover as ISOs"; exit 1; }
|
mv pep-live-${ARCH}-${DATE}-*.iso /var/www/html/ || { echo "Erro ao mover as ISOs"; exit 1; }
|
||||||
}
|
}
|
||||||
|
|
||||||
# No final do script, após a chamada de build_variant
|
# No final do script, após a chamada de build_variant
|
||||||
|
|
Loading…
Reference in New Issue