Unified · Split
| @@ -7,7 +7,7 @@ while getopts "a:b:hr:" opt; do · 6 unmodified lines | ||
| 7 | 7 | case $opt in |
| 8 | 8 | a) ARCH="$OPTARG";; |
| 9 | 9 | b) IMAGE="$OPTARG";; |
| 10 | − h) echo "${0#/*}: [-a arch] [-b base|e|xfce|mate|cinnamon|kde|lxde|lxqt] [-r repo]" >&2; exit 1;; | |
| 10 | + h) echo "${0#/*}: [-a arch] [-b base|e|xfce|mate|cinnamon|gnome|kde|lxde|lxqt] [-r repo]" >&2; exit 1;; | |
| 11 | 11 | r) REPO="-r $OPTARG $REPO";; |
| 12 | 12 | esac |
| 13 | 13 | done |
| @@ -21,6 +21,7 @@ readonly E_IMG=void-live-${ARCH}-${DATE}-enlightenment.iso · 7 unmodified lines | ||
| 21 | 21 | readonly XFCE_IMG=void-live-${ARCH}-${DATE}-xfce.iso |
| 22 | 22 | readonly MATE_IMG=void-live-${ARCH}-${DATE}-mate.iso |
| 23 | 23 | readonly CINNAMON_IMG=void-live-${ARCH}-${DATE}-cinnamon.iso |
| 24 | +readonly GNOME_IMG=void-live-${ARCH}-${DATE}-gnome.iso | |
| 24 | 25 | readonly KDE_IMG=void-live-${ARCH}-${DATE}-kde.iso |
| 25 | 26 | readonly LXDE_IMG=void-live-${ARCH}-${DATE}-lxde.iso |
| 26 | 27 | readonly LXQT_IMG=void-live-${ARCH}-${DATE}-lxqt.iso |
| @@ -33,6 +34,7 @@ readonly E_PKGS="$X_PKGS lxdm enlightenment terminology econnman udisks2 firefox · 6 unmodified lines | ||
| 33 | 34 | readonly XFCE_PKGS="$X_PKGS lxdm xfce4 gnome-themes-standard gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr" |
| 34 | 35 | readonly MATE_PKGS="$X_PKGS lxdm mate mate-extra gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr" |
| 35 | 36 | readonly CINNAMON_PKGS="$X_PKGS lxdm cinnamon gnome-keyring colord gnome-terminal gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr" |
| 37 | +readonly GNOME_PKGS="$X_PKGS gnome gnome-terminal firefox-esr" | |
| 36 | 38 | readonly KDE_PKGS="$X_PKGS kde5 konsole firefox dolphin" |
| 37 | 39 | readonly LXDE_PKGS="$X_PKGS lxdm lxde gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr" |
| 38 | 40 | readonly LXQT_PKGS="$X_PKGS lxdm lxqt gvfs-afc gvfs-mtp gvfs-smb udisks2 qupzilla" |
| @@ -64,6 +66,13 @@ if [ -z "$IMAGE" -o "$IMAGE" = cinnamon ]; then · 25 unmodified lines | ||
| 64 | 66 | ./mklive.sh -a $ARCH -o $CINNAMON_IMG -p "$CINNAMON_PKGS" ${REPO} $@ |
| 65 | 67 | fi |
| 66 | 68 | fi |
| 69 | + | |
| 70 | +if [ -z "$IMAGE" -o "$IMAGE" = gnome ]; then | |
| 71 | + if [ ! -e $CINNAMON_IMG ]; then | |
| 72 | + ./mklive.sh -a $ARCH -o $GNOME_IMG -p "$GNOME_PKGS" ${REPO} $@ | |
| 73 | + fi | |
| 74 | +fi | |
| 75 | + | |
| 67 | 76 | if [ -z "$IMAGE" -o "$IMAGE" = lxde ]; then |
| 68 | 77 | if [ ! -e $LXDE_IMG ]; then |
| 69 | 78 | ./mklive.sh -a $ARCH -o $LXDE_IMG -p "$LXDE_PKGS" ${REPO} $@ |