From 409a76a7c7966f457b2ab8df9160b1d3b45444da Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sat, 26 May 2018 20:49:22 -0400 Subject: consolidate install wizards package lists --- .../.install-openrc-lxde/language/en/install.sh | 54 ++-------------- .../.install-openrc-lxde/language/es/install.sh | 50 +-------------- .../.install-openrc-lxde/language/gl/install.sh | 52 ++-------------- .../.install-openrc-lxde/language/pt/install.sh | 50 +-------------- .../root-image/root/.install-openrc-lxde/packages | 63 +++++++++++++++++++ .../.install-systemd-mate/language/en/install.sh | 71 +++------------------- .../.install-systemd-mate/language/es/install.sh | 69 ++------------------- .../.install-systemd-mate/language/gl/install.sh | 69 ++------------------- .../.install-systemd-mate/language/pt/install.sh | 69 ++------------------- .../root-image/root/.install-systemd-mate/packages | 53 ++++++++++++++++ 10 files changed, 153 insertions(+), 447 deletions(-) create mode 100644 configs/profile/root-image/root/.install-openrc-lxde/packages create mode 100644 configs/profile/root-image/root/.install-systemd-mate/packages diff --git a/configs/profile/root-image/root/.install-openrc-lxde/language/en/install.sh b/configs/profile/root-image/root/.install-openrc-lxde/language/en/install.sh index f8f1592..20deee3 100755 --- a/configs/profile/root-image/root/.install-openrc-lxde/language/en/install.sh +++ b/configs/profile/root-image/root/.install-openrc-lxde/language/en/install.sh @@ -2,8 +2,8 @@ #Temporal is a file that contains parameters to use when access to chroot if [ ! -f /root/.install-openrc-lxde/.pacman ]; then - pacman -Sy parabola-keyring archlinux-keyring --noconfirm - pacman-key --populate parabola archlinux + pacman -Sy archlinux-keyring archlinux32-keyring parabola-keyring --noconfirm + pacman-key --populate archlinux archlinux32 parabola pacman-key --refresh-keys case $? in 0) touch /root/.install-openrc-lxde/.pacman @@ -150,53 +150,9 @@ while [ option != 7 ]; do ;; 6) #Packages to the X11 live - packages=( "xorg-server" - "xf86-input-evdev" - "xf86-input-synaptics" - "xf86-video-ati" - "xf86-video-dummy" - "xf86-video-fbdev" - "xf86-video-intel" - "xf86-video-nouveau" - "xf86-video-openchrome" - "xf86-video-sisusb" - "xf86-video-vesa" - "xf86-video-vmware" - "xf86-video-voodoo" - "xf86-video-qxl" - "xorg-xinit" - "gst-plugins-good" - "gst-libav" - "lxde" - "volumeicon" - "zenity" - "octopi" - "pulseaudio-alsa" - "alsa-utils" - "networkmanager-elogind" - "network-manager-applet" - "ath9k-htc-firmware" - "iceweasel" - "icedove" - "pidgin" - "gparted" - "smplayer" - "epdfview" - "gpicview" - "abiword" - "gnumeric" - "leafpad" - "galculator-gtk2" - "xarchiver" - "openrc-desktop" - "polkit-elogind" - "gvfs-mtp" - "gvfs-gphoto2" - "xdg-user-dirs" - "gnome-screenshot" - ) - - #Install packages + packages=( $( cat ./packages ) ) + + #Install packages pacman -Sy -r /mnt ${packages[@]} --needed --noconfirm user=$(cat /root/.install-openrc-lxde/temporal | grep "userName" ) diff --git a/configs/profile/root-image/root/.install-openrc-lxde/language/es/install.sh b/configs/profile/root-image/root/.install-openrc-lxde/language/es/install.sh index c4e00f6..1f8db2c 100755 --- a/configs/profile/root-image/root/.install-openrc-lxde/language/es/install.sh +++ b/configs/profile/root-image/root/.install-openrc-lxde/language/es/install.sh @@ -2,8 +2,8 @@ #Temporal is a file that contains parameters to use when access to chroot if [ ! -f /root/.install-openrc-lxde/.pacman ]; then - pacman -Sy parabola-keyring archlinux-keyring --noconfirm - pacman-key --populate parabola archlinux + pacman -Sy archlinux-keyring archlinux32-keyring parabola-keyring --noconfirm + pacman-key --populate archlinux archlinux32 parabola pacman-key --refresh-keys case $? in 0) touch /root/.install-openrc-lxde/.pacman @@ -150,51 +150,7 @@ while [ option != 7 ]; do ;; 6) #Packages to the X11 live - packages=( "xorg-server" - "xf86-input-evdev" - "xf86-input-synaptics" - "xf86-video-ati" - "xf86-video-dummy" - "xf86-video-fbdev" - "xf86-video-intel" - "xf86-video-nouveau" - "xf86-video-openchrome" - "xf86-video-sisusb" - "xf86-video-vesa" - "xf86-video-vmware" - "xf86-video-voodoo" - "xf86-video-qxl" - "xorg-xinit" - "gst-plugins-good" - "gst-libav" - "lxde" - "volumeicon" - "zenity" - "octopi" - "pulseaudio-alsa" - "alsa-utils" - "networkmanager-elogind" - "network-manager-applet" - "ath9k-htc-firmware" - "iceweasel" - "icedove" - "pidgin" - "gparted" - "smplayer" - "epdfview" - "gpicview" - "abiword" - "gnumeric" - "leafpad" - "galculator-gtk2" - "xarchiver" - "openrc-desktop" - "polkit-elogind" - "gvfs-mtp" - "gvfs-gphoto2" - "xdg-user-dirs" - "gnome-screenshot" - ) + packages=( $( cat ./packages ) ) #Install packages pacman -Sy -r /mnt ${packages[@]} --needed --noconfirm diff --git a/configs/profile/root-image/root/.install-openrc-lxde/language/gl/install.sh b/configs/profile/root-image/root/.install-openrc-lxde/language/gl/install.sh index 22c0d9c..0bbb9c6 100755 --- a/configs/profile/root-image/root/.install-openrc-lxde/language/gl/install.sh +++ b/configs/profile/root-image/root/.install-openrc-lxde/language/gl/install.sh @@ -2,8 +2,8 @@ #Temporal is a file that contains parameters to use when access to chroot if [ ! -f /root/.install-openrc-lxde/.pacman ]; then - pacman -Sy parabola-keyring archlinux-keyring --noconfirm - pacman-key --populate parabola archlinux + pacman -Sy archlinux-keyring archlinux32-keyring parabola-keyring --noconfirm + pacman-key --populate archlinux archlinux32 parabola pacman-key --refresh-keys case $? in 0) touch /root/.install-openrc-lxde/.pacman @@ -148,52 +148,8 @@ while [ option != 7 ]; do rm -r /mnt/userAccount.sh ;; 6) - #Packages to the X11 live - packages=( "xorg-server" - "xf86-input-evdev" - "xf86-input-synaptics" - "xf86-video-ati" - "xf86-video-dummy" - "xf86-video-fbdev" - "xf86-video-intel" - "xf86-video-nouveau" - "xf86-video-openchrome" - "xf86-video-sisusb" - "xf86-video-vesa" - "xf86-video-vmware" - "xf86-video-voodoo" - "xf86-video-qxl" - "xorg-xinit" - "gst-plugins-good" - "gst-libav" - "lxde" - "volumeicon" - "zenity" - "octopi" - "pulseaudio-alsa" - "alsa-utils" - "networkmanager-elogind" - "network-manager-applet" - "ath9k-htc-firmware" - "iceweasel" - "icedove" - "pidgin" - "gparted" - "smplayer" - "epdfview" - "gpicview" - "abiword" - "gnumeric" - "leafpad" - "galculator-gtk2" - "xarchiver" - "openrc-desktop" - "polkit-elogind" - "gvfs-mtp" - "gvfs-gphoto2" - "xdg-user-dirs" - "gnome-screenshot" - ) + #Packages to the X11 live + packages=( $( cat ./packages ) ) #Install packages pacman -Sy -r /mnt ${packages[@]} --needed --noconfirm diff --git a/configs/profile/root-image/root/.install-openrc-lxde/language/pt/install.sh b/configs/profile/root-image/root/.install-openrc-lxde/language/pt/install.sh index 6c1facf..a517f4e 100755 --- a/configs/profile/root-image/root/.install-openrc-lxde/language/pt/install.sh +++ b/configs/profile/root-image/root/.install-openrc-lxde/language/pt/install.sh @@ -2,8 +2,8 @@ #Temporal is a file that contains parameters to use when access to chroot if [ ! -f /root/.install-openrc-lxde/.pacman ]; then - pacman -Sy parabola-keyring archlinux-keyring --noconfirm - pacman-key --populate parabola archlinux + pacman -Sy archlinux-keyring archlinux32-keyring parabola-keyring --noconfirm + pacman-key --populate archlinux archlinux32 parabola pacman-key --refresh-keys case $? in 0) touch /root/.install-openrc-lxde/.pacman @@ -150,51 +150,7 @@ while [ option != 7 ]; do ;; 6) #Packages to the X11 live - packages=( "xorg-server" - "xf86-input-evdev" - "xf86-input-synaptics" - "xf86-video-ati" - "xf86-video-dummy" - "xf86-video-fbdev" - "xf86-video-intel" - "xf86-video-nouveau" - "xf86-video-openchrome" - "xf86-video-sisusb" - "xf86-video-vesa" - "xf86-video-vmware" - "xf86-video-voodoo" - "xf86-video-qxl" - "xorg-xinit" - "gst-plugins-good" - "gst-libav" - "lxde" - "volumeicon" - "zenity" - "octopi" - "pulseaudio-alsa" - "alsa-utils" - "networkmanager-elogind" - "network-manager-applet" - "ath9k-htc-firmware" - "iceweasel" - "icedove" - "pidgin" - "gparted" - "smplayer" - "epdfview" - "gpicview" - "abiword" - "gnumeric" - "leafpad" - "galculator-gtk2" - "xarchiver" - "openrc-desktop" - "polkit-elogind" - "gvfs-mtp" - "gvfs-gphoto2" - "xdg-user-dirs" - "gnome-screenshot" - ) + packages=( $( cat ./packages ) ) #Install packages pacman -Sy -r /mnt ${packages[@]} --needed --noconfirm diff --git a/configs/profile/root-image/root/.install-openrc-lxde/packages b/configs/profile/root-image/root/.install-openrc-lxde/packages new file mode 100644 index 0000000..7fae0a9 --- /dev/null +++ b/configs/profile/root-image/root/.install-openrc-lxde/packages @@ -0,0 +1,63 @@ +base-openrc +gpm-openrc +haveged-openrc +hdparm-openrc +networkmanager-openrc +ntp-openrc +openssh-openrc +openvpn-openrc +rsync-openrc +wpa_supplicant-openrc +bash-completion +p7zip +sudo +unar +unzip +zip +abiword +gnumeric +icedove +iceweasel +leafpad +octopi +octopi-cachecleaner +octopi-notifier +octopi-repoeditor +pidgin +qtox +ring +smplayer +alsa-utils +gst-libav +gst-plugins-good +pulseaudio-alsa +network-manager-applet +parabola-laf +xdg-user-dirs +dmidecode +gnome-keyring +gparted +gvfs +gxmessage +wbar +ttf-dejavu +xorg +xorg-drivers +xf86-input-elographics +xf86-input-wacom +xf86-video-sisusb +xorg-xinit +gvfs-mtp +gvfs-gphoto2 +networkmanager-elogind +openrc-desktop +polkit-elogind +epdfview +galculator-gtk2 +gksu +gnome-screenshot +gpicview +lxde +obconf +xarchiver +xscreensaver diff --git a/configs/profile/root-image/root/.install-systemd-mate/language/en/install.sh b/configs/profile/root-image/root/.install-systemd-mate/language/en/install.sh index e95a0d5..21ba0a1 100755 --- a/configs/profile/root-image/root/.install-systemd-mate/language/en/install.sh +++ b/configs/profile/root-image/root/.install-systemd-mate/language/en/install.sh @@ -1,9 +1,6 @@ #!/bin/bash #Temporal is a file that contains parameters to use when access to chroot -pacman -Sy parabola-keyring --noconfirm -pacman-key --populate parabola -pacman-key --refresh-keys partition(){ @@ -91,6 +88,10 @@ partition(){ } +pacman -Sy archlinux-keyring archlinux32-keyring parabola-keyring --noconfirm +pacman-key --populate archlinux archlinux32 parabola +pacman-key --refresh-keys + option=0 while [ option != 7 ]; do option=$(dialog --stdout --menu "Parabola Installation CLI" 20 70 50 \ @@ -128,67 +129,9 @@ while [ option != 7 ]; do ;; 5) #Packages to the X11 live - packages=( "xorg-server" - "xf86-input-evdev" - "xf86-input-synaptics" - "xf86-video-amdgpu" - "xf86-video-ati" - "xf86-video-dummy" - "xf86-video-fbdev" - "xf86-video-intel" - "xf86-video-nouveau" - "xf86-video-openchrome" - "xf86-video-sisusb" - "xf86-video-vesa" - "xf86-video-vmware" - "xf86-video-voodoo" - "xf86-video-qxl" - "xorg-xinit" - "sudo" - "gst-plugins-good" - "gst-libav" - "mate" - "mate-extra" - "caja" - "volumeicon" - "zenity" - "octopi" - "octopi-cachecleaner" - "octopi-notifier" - "octopi-repoeditor" - "ambiance-radiance-colors-suite" - "rave-x-colors" - "pulseaudio-alsa" - "alsa-utils" - "networkmanager" - "network-manager-applet" - "ath9k-htc-firmware" - "gnome-keyring" - "iceweasel" - "icedove" - "pidgin" - "linphone" - "qtox" - "gparted" - "smplayer" - "epdfview" - "gpicview" - "abiword" - "gnumeric" - "leafpad" - "galculator-gtk2" - "xarchiver" - "dmidecode" - "lightdm-gtk-greeter-settings" - "grub2-theme-gnuaxiom" - "p7zip" - "unar" - "unzip" - "zip" - "ttf-dejavu" - ) - - #Install packages + packages=( $( cat ./packages ) ) + + #Install packages pacstrap /mnt ${packages[@]} user=$(cat /root/.install-systemd-mate/temporal | grep "userName" ) diff --git a/configs/profile/root-image/root/.install-systemd-mate/language/es/install.sh b/configs/profile/root-image/root/.install-systemd-mate/language/es/install.sh index 65cdab4..a122b9a 100755 --- a/configs/profile/root-image/root/.install-systemd-mate/language/es/install.sh +++ b/configs/profile/root-image/root/.install-systemd-mate/language/es/install.sh @@ -1,9 +1,6 @@ #!/bin/bash #Temporal is a file that contains parameters to use when access to chroot -pacman -Sy parabola-keyring --noconfirm -pacman-key --populate parabola -pacman-key --refresh-keys partition(){ @@ -91,6 +88,10 @@ partition(){ } +pacman -Sy archlinux-keyring archlinux32-keyring parabola-keyring --noconfirm +pacman-key --populate archlinux archlinux32 parabola +pacman-key --refresh-keys + option=0 while [ option != 7 ]; do option=$(dialog --stdout --menu "Instalación CLI de Parabola" 20 70 50 \ @@ -128,67 +129,7 @@ while [ option != 7 ]; do ;; 5) #Packages to the X11 live - packages=( "xorg-server" - "xf86-input-evdev" - "xf86-input-synaptics" - "xf86-video-amdgpu" - "xf86-video-ati" - "xf86-video-dummy" - "xf86-video-fbdev" - "xf86-video-intel" - "xf86-video-nouveau" - "xf86-video-openchrome" - "xf86-video-sisusb" - "xf86-video-vesa" - "xf86-video-vmware" - "xf86-video-voodoo" - "xf86-video-qxl" - "xorg-xinit" - "sudo" - "gst-plugins-good" - "gst-libav" - "mate" - "mate-extra" - "caja" - "volumeicon" - "zenity" - "octopi" - "octopi-cachecleaner" - "octopi-notifier" - "octopi-repoeditor" - "ambiance-radiance-colors-suite" - "rave-x-colors" - "pulseaudio-alsa" - "alsa-utils" - "networkmanager" - "network-manager-applet" - "ath9k-htc-firmware" - "gnome-keyring" - "iceweasel" - "iceweasel-l10n-es-es" - "icedove" - "icedove-l10n-es-es" - "pidgin" - "linphone" - "qtox" - "gparted" - "smplayer" - "epdfview" - "gpicview" - "abiword" - "gnumeric" - "leafpad" - "galculator-gtk2" - "xarchiver" - "dmidecode" - "lightdm-gtk-greeter-settings" - "grub2-theme-gnuaxiom" - "p7zip" - "unar" - "unzip" - "zip" - "ttf-dejavu" - ) + packages=( $( cat ./packages ) ) #Install packages pacstrap /mnt ${packages[@]} diff --git a/configs/profile/root-image/root/.install-systemd-mate/language/gl/install.sh b/configs/profile/root-image/root/.install-systemd-mate/language/gl/install.sh index 43957bb..f71e2ad 100755 --- a/configs/profile/root-image/root/.install-systemd-mate/language/gl/install.sh +++ b/configs/profile/root-image/root/.install-systemd-mate/language/gl/install.sh @@ -1,9 +1,6 @@ #!/bin/bash #Temporal is a file that contains parameters to use when access to chroot -pacman -Sy parabola-keyring --noconfirm -pacman-key --populate parabola -pacman-key --refresh-keys partition(){ @@ -91,6 +88,10 @@ partition(){ } +pacman -Sy archlinux-keyring archlinux32-keyring parabola-keyring --noconfirm +pacman-key --populate archlinux archlinux32 parabola +pacman-key --refresh-keys + option=0 while [ option != 7 ]; do option=$(dialog --stdout --menu "Instalación CLI de Parabola" 20 70 50 \ @@ -128,67 +129,7 @@ while [ option != 7 ]; do ;; 5) #Packages to the X11 live - packages=( "xorg-server" - "xf86-input-evdev" - "xf86-input-synaptics" - "xf86-video-amdgpu" - "xf86-video-ati" - "xf86-video-dummy" - "xf86-video-fbdev" - "xf86-video-intel" - "xf86-video-nouveau" - "xf86-video-openchrome" - "xf86-video-sisusb" - "xf86-video-vesa" - "xf86-video-vmware" - "xf86-video-voodoo" - "xf86-video-qxl" - "xorg-xinit" - "sudo" - "gst-plugins-good" - "gst-libav" - "mate" - "mate-extra" - "caja" - "volumeicon" - "zenity" - "octopi" - "octopi-cachecleaner" - "octopi-notifier" - "octopi-repoeditor" - "ambiance-radiance-colors-suite" - "rave-x-colors" - "pulseaudio-alsa" - "alsa-utils" - "networkmanager" - "network-manager-applet" - "ath9k-htc-firmware" - "gnome-keyring" - "iceweasel" - "iceweasel-l10n-gl" - "icedove" - "icedove-l10n-gl" - "pidgin" - "linphone" - "qtox" - "gparted" - "smplayer" - "epdfview" - "gpicview" - "abiword" - "gnumeric" - "leafpad" - "galculator-gtk2" - "xarchiver" - "dmidecode" - "lightdm-gtk-greeter-settings" - "grub2-theme-gnuaxiom" - "p7zip" - "unar" - "unzip" - "zip" - "ttf-dejavu" - ) + packages=( $( cat ./packages ) ) #Install packages pacstrap /mnt ${packages[@]} diff --git a/configs/profile/root-image/root/.install-systemd-mate/language/pt/install.sh b/configs/profile/root-image/root/.install-systemd-mate/language/pt/install.sh index a438fb7..aabfed0 100755 --- a/configs/profile/root-image/root/.install-systemd-mate/language/pt/install.sh +++ b/configs/profile/root-image/root/.install-systemd-mate/language/pt/install.sh @@ -1,9 +1,6 @@ #!/bin/bash #Temporal is a file that contains parameters to use when access to chroot -pacman -Sy parabola-keyring --noconfirm -pacman-key --populate parabola -pacman-key --refresh-keys partition(){ @@ -91,6 +88,10 @@ partition(){ } +pacman -Sy archlinux-keyring archlinux32-keyring parabola-keyring --noconfirm +pacman-key --populate archlinux archlinux32 parabola +pacman-key --refresh-keys + option=0 while [ option != 7 ]; do option=$(dialog --stdout --menu "Instalação CLI do Parabola" 20 70 50 \ @@ -128,67 +129,7 @@ while [ option != 7 ]; do ;; 5) #Packages to the X11 live - packages=( "xorg-server" - "xf86-input-evdev" - "xf86-input-synaptics" - "xf86-video-amdgpu" - "xf86-video-ati" - "xf86-video-dummy" - "xf86-video-fbdev" - "xf86-video-intel" - "xf86-video-nouveau" - "xf86-video-openchrome" - "xf86-video-sisusb" - "xf86-video-vesa" - "xf86-video-vmware" - "xf86-video-voodoo" - "xf86-video-qxl" - "xorg-xinit" - "sudo" - "gst-plugins-good" - "gst-libav" - "mate" - "mate-extra" - "caja" - "volumeicon" - "zenity" - "octopi" - "octopi-cachecleaner" - "octopi-notifier" - "octopi-repoeditor" - "ambiance-radiance-colors-suite" - "rave-x-colors" - "pulseaudio-alsa" - "alsa-utils" - "networkmanager" - "network-manager-applet" - "ath9k-htc-firmware" - "gnome-keyring" - "iceweasel" - "iceweasel-l10n-pt-br" - "icedove" - "icedove-l10n-pt-br" - "pidgin" - "linphone" - "qtox" - "gparted" - "smplayer" - "epdfview" - "gpicview" - "abiword" - "gnumeric" - "leafpad" - "galculator-gtk2" - "xarchiver" - "dmidecode" - "lightdm-gtk-greeter-settings" - "grub2-theme-gnuaxiom" - "p7zip" - "unar" - "unzip" - "zip" - "ttf-dejavu" - ) + packages=( $( cat ./packages ) ) #Install packages pacstrap /mnt ${packages[@]} diff --git a/configs/profile/root-image/root/.install-systemd-mate/packages b/configs/profile/root-image/root/.install-systemd-mate/packages new file mode 100644 index 0000000..0d0fd76 --- /dev/null +++ b/configs/profile/root-image/root/.install-systemd-mate/packages @@ -0,0 +1,53 @@ +base +gpm +haveged +hdparm +networkmanager +ntp +openssh +openvpn +rsync +wpa_supplicant +bash-completion +p7zip +sudo +unar +unzip +zip +abiword +gnumeric +icedove +iceweasel +leafpad +octopi +octopi-cachecleaner +octopi-notifier +octopi-repoeditor +pidgin +qtox +ring +smplayer +alsa-utils +gst-libav +gst-plugins-good +pulseaudio-alsa +network-manager-applet +parabola-laf +xdg-user-dirs +dmidecode +gnome-keyring +gparted +gvfs +gxmessage +wbar +ttf-dejavu +xorg +xorg-drivers +xf86-input-elographics +xf86-input-wacom +xf86-video-sisusb +xorg-xinit +lightdm-gtk-greeter-settings +mate +mate-extra +volumeicon -- cgit v1.2.2