|
|
@@ -7,7 +7,7 @@ while getopts "a:b:hr:" opt; do
|
|
|
case $opt in
|
|
|
a) ARCH="$OPTARG";;
|
|
|
b) IMAGE="$OPTARG";;
|
|
|
- h) echo "${0#/*}: [-a arch] [-b base|e|xfce|mate|cinnamon|kde|lxde|lxqt] [-r repo]" >&2; exit 1;;
|
|
|
+ h) echo "${0#/*}: [-a arch] [-b base|e|xfce|mate|cinnamon|gnome|kde|lxde|lxqt] [-r repo]" >&2; exit 1;;
|
|
|
r) REPO="-r $OPTARG $REPO";;
|
|
|
esac
|
|
|
done
|
|
|
@@ -21,6 +21,7 @@ readonly E_IMG=void-live-${ARCH}-${DATE}-enlightenment.iso
|
|
|
readonly XFCE_IMG=void-live-${ARCH}-${DATE}-xfce.iso
|
|
|
readonly MATE_IMG=void-live-${ARCH}-${DATE}-mate.iso
|
|
|
readonly CINNAMON_IMG=void-live-${ARCH}-${DATE}-cinnamon.iso
|
|
|
+readonly GNOME_IMG=void-live-${ARCH}-${DATE}-gnome.iso
|
|
|
readonly KDE_IMG=void-live-${ARCH}-${DATE}-kde.iso
|
|
|
readonly LXDE_IMG=void-live-${ARCH}-${DATE}-lxde.iso
|
|
|
readonly LXQT_IMG=void-live-${ARCH}-${DATE}-lxqt.iso
|
|
|
@@ -33,6 +34,7 @@ readonly E_PKGS="$X_PKGS lxdm enlightenment terminology econnman udisks2 firefox
|
|
|
readonly XFCE_PKGS="$X_PKGS lxdm xfce4 gnome-themes-standard gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"
|
|
|
readonly MATE_PKGS="$X_PKGS lxdm mate mate-extra gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"
|
|
|
readonly CINNAMON_PKGS="$X_PKGS lxdm cinnamon gnome-keyring colord gnome-terminal gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"
|
|
|
+readonly GNOME_PKGS="$X_PKGS gnome gnome-terminal firefox-esr"
|
|
|
readonly KDE_PKGS="$X_PKGS kde5 konsole firefox dolphin"
|
|
|
readonly LXDE_PKGS="$X_PKGS lxdm lxde gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"
|
|
|
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
|
|
|
./mklive.sh -a $ARCH -o $CINNAMON_IMG -p "$CINNAMON_PKGS" ${REPO} $@
|
|
|
fi
|
|
|
fi
|
|
|
+
|
|
|
+if [ -z "$IMAGE" -o "$IMAGE" = gnome ]; then
|
|
|
+ if [ ! -e $CINNAMON_IMG ]; then
|
|
|
+ ./mklive.sh -a $ARCH -o $GNOME_IMG -p "$GNOME_PKGS" ${REPO} $@
|
|
|
+ fi
|
|
|
+fi
|
|
|
+
|
|
|
if [ -z "$IMAGE" -o "$IMAGE" = lxde ]; then
|
|
|
if [ ! -e $LXDE_IMG ]; then
|
|
|
./mklive.sh -a $ARCH -o $LXDE_IMG -p "$LXDE_PKGS" ${REPO} $@
|
John Zimmermann