Unified · Split
| @@ -1,5 +1,7 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | 2 | ||
| 3 | readonly TARGET="$1" | ||
| 4 | |||
| 3 | readonly ARCH=$(uname -m) | 5 | readonly ARCH=$(uname -m) |
| 4 | readonly DATE=$(date +%Y%m%d) | 6 | readonly DATE=$(date +%Y%m%d) |
| 5 | readonly BASE_IMG=void-live-${ARCH}-${DATE}.iso | 7 | readonly BASE_IMG=void-live-${ARCH}-${DATE}.iso |
| @@ -14,27 +16,36 @@ case "$ARCH" in · 8 unmodified lines | |||
| 14 | esac | 16 | esac |
| 15 | 17 | ||
| 16 | readonly BASE_PKGS="dialog cryptsetup lvm2 mdadm $GRUB" | 18 | readonly BASE_PKGS="dialog cryptsetup lvm2 mdadm $GRUB" |
| 17 | readonly X_PKGS="$BASE_PKGS xorg-minimal xorg-input-drivers xorg-video-drivers lxdm setxkbmap xauth font-misc-misc terminus-font cantarell-fonts gnome-themes-standard" | 19 | readonly X_PKGS="$BASE_PKGS xorg-minimal xorg-input-drivers xorg-video-drivers setxkbmap xauth font-misc-misc terminus-font cantarell-fonts gnome-themes-standard alsa-plugins-pulseaudio" |
| 18 | readonly E_PKGS="$X_PKGS enlightenment terminology econnman udisks2 firefox" | 20 | readonly E_PKGS="$X_PKGS lxdm enlightenment terminology econnman udisks2" |
| 19 | readonly XFCE_PKGS="$X_PKGS xfce4 firefox network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2" | 21 | readonly XFCE_PKGS="$X_PKGS lxdm xfce4 network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2" |
| 20 | readonly MATE_PKGS="$X_PKGS mate mate-extra firefox network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2" | 22 | readonly MATE_PKGS="$X_PKGS lxdm mate mate-extra network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2" |
| 21 | readonly CINNAMON_PKGS="$X_PKGS cinnamon firefox gnome-terminal gvfs-afc gvfs-mtp gvfs-smb udisks2" | 23 | readonly CINNAMON_PKGS="$X_PKGS lxdm cinnamon colord gnome-terminal gvfs-afc gvfs-mtp gvfs-smb udisks2" |
| 22 | 24 | ||
| 23 | [ ! -x mklive.sh ] && exit 0 | 25 | [ ! -x mklive.sh ] && exit 0 |
| 24 | 26 | ||
| 25 | if [ ! -e $BASE_IMG ]; then | 27 | if [ -z "$TARGET" -o $TARGET = base ]; then |
| 26 | ./mklive.sh -o $BASE_IMG -p "$BASE_PKGS" $@ | 28 | if [ ! -e $BASE_IMG ]; then |
| 29 | ./mklive.sh -o $BASE_IMG -p "$BASE_PKGS" $@ | ||
| 30 | fi | ||
| 27 | fi | 31 | fi |
| 28 | if [ ! -e $E_IMG ]; then | 32 | if [ -z "$TARGET" -o $TARGET = e ]; then |
| 29 | ./mklive.sh -o $E_IMG -p "$E_PKGS" $@ | 33 | if [ ! -e $E_IMG ]; then |
| 34 | ./mklive.sh -o $E_IMG -p "$E_PKGS" $@ | ||
| 35 | fi | ||
| 30 | fi | 36 | fi |
| 31 | if [ ! -e $XFCE_IMG ]; then | 37 | if [ -z "$TARGET" -o $TARGET = xfce ]; then |
| 32 | ./mklive.sh -o $XFCE_IMG -p "$XFCE_PKGS" $@ | 38 | if [ ! -e $XFCE_IMG ]; then |
| 39 | ./mklive.sh -o $XFCE_IMG -p "$XFCE_PKGS" $@ | ||
| 40 | fi | ||
| 33 | fi | 41 | fi |
| 34 | if [ ! -e $MATE_IMG ]; then | 42 | if [ -z "$TARGET" -o $TARGET = mate ]; then |
| 35 | ./mklive.sh -o $MATE_IMG -p "$MATE_PKGS" $@ | 43 | if [ ! -e $MATE_IMG ]; then |
| 44 | ./mklive.sh -o $MATE_IMG -p "$MATE_PKGS" $@ | ||
| 45 | fi | ||
| 36 | fi | 46 | fi |
| 37 | if [ ! -e $CINNAMON_IMG ]; then | 47 | if [ -z "$TARGET" -o $TARGET = cinnamon ]; then |
| 38 | ./mklive.sh -o $CINNAMON_IMG -p "$CINNAMON_PKGS" $@ | 48 | if [ ! -e $CINNAMON_IMG ]; then |
| 49 | ./mklive.sh -o $CINNAMON_IMG -p "$CINNAMON_PKGS" $@ | ||
| 50 | fi | ||
| 39 | fi | 51 | fi |
| 40 | |||