Use C-style 'include' in lists (backwards compatible).
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
This commit is contained in:
Chris Lamb
Daniel Baumann
parent
d1dd598f83
commit
8b59b61bb2
|
|
@ -34,7 +34,7 @@ Expand_packagelist_file ()
|
|||
shift
|
||||
shift
|
||||
|
||||
for INCLUDE in $(sed -ne 's|^#<include> \(.*\)|\1|gp' "${FILE}");
|
||||
for INCLUDE in $(sed -ne 's|^#<include> \(.*\)|\1|gp' -e 's|^#include <\(.*\)>|\1|gp' "${FILE}")
|
||||
do
|
||||
Expand_packagelist "${INCLUDE}" "${@}"
|
||||
done
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/devel-live - package list for live-helper(7)
|
||||
|
||||
## LH: Development (Debian Live)
|
||||
#<include> standard
|
||||
#include <standard>
|
||||
|
||||
# live-helper
|
||||
cdebootstrap debootstrap
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/gnome - package list for live-helper(7)
|
||||
|
||||
## LH: GNOME Desktop
|
||||
#<include> gnome-core
|
||||
#include <gnome-core>
|
||||
|
||||
gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
|
||||
gnome-themes-extras
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/gnome-core - package list for live-helper(7)
|
||||
|
||||
## LH: GNOME Core
|
||||
#<include> standard-x11
|
||||
#include <standard-x11>
|
||||
|
||||
gdm gnome-core
|
||||
desktop-base
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/gnome-full - package list for live-helper(7)
|
||||
|
||||
## LH: GNOME full
|
||||
#<include> gnome
|
||||
#include <gnome>
|
||||
|
||||
gdm gnome
|
||||
desktop-base
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/gnome-junior - package list for live-helper(7)
|
||||
|
||||
## LH: Debian Junior (Gnome)
|
||||
#<include> gnome
|
||||
#<include> junior-pkgs
|
||||
#include <gnome>
|
||||
#include <junior-pkgs>
|
||||
|
||||
junior-gnome
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/gnustep - package list for live-helper(7)
|
||||
|
||||
## LH: GNUstep desktop
|
||||
#<include> standard-x11
|
||||
#include <standard-x11>
|
||||
|
||||
wdm
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/kde - package list for live-helper(7)
|
||||
|
||||
## LH: KDE
|
||||
#<include> kde-core
|
||||
#include <kde-core>
|
||||
|
||||
kde kdm
|
||||
desktop-base
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/kde-core - package list for live-helper(7)
|
||||
|
||||
## LH: KDE Core
|
||||
#<include> standard-x11
|
||||
#include <standard-x11>
|
||||
|
||||
kde-core kdm
|
||||
desktop-base
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# /usr/share/live-helper/lists/kde-extra - package list for live-helper(7)
|
||||
|
||||
## LH: KDE Extra
|
||||
#<include> kde-full
|
||||
#include <kde-full>
|
||||
|
||||
kde-extras
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# /usr/share/live-helper/lists/kde-full - package list for live-helper(7)
|
||||
|
||||
## LH: KDE Full
|
||||
#<include> kde
|
||||
#include <kde>
|
||||
|
||||
koffice
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/kde-junior - package list for live-helper(7)
|
||||
|
||||
## LH: KDE Junior
|
||||
#<include> kde
|
||||
#<include> junior-pkgs
|
||||
#include <kde>
|
||||
#include <junior-pkgs>
|
||||
|
||||
junior-kde
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/knoppix - package list for live-helper(7)
|
||||
|
||||
## LH: KNOPPIX (CD)
|
||||
#<include> standard
|
||||
#include <standard>
|
||||
|
||||
# packagelist inspired from Knoppix 5.1.1.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/knoppix-dvd - package list for live-helper(7)
|
||||
|
||||
## LH: KNOPPIX (DVD)
|
||||
#<include> standard
|
||||
#include <standard>
|
||||
|
||||
# packagelist inspired from Knoppix 5.1.1.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/rescue - package list for live-helper(7)
|
||||
|
||||
## LH: Rescue
|
||||
#<include> standard
|
||||
#include <standard>
|
||||
|
||||
# System
|
||||
gnupg dash discover gawk grub htop lilo ltrace pstack screen strace units
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# /usr/share/live-helper/lists/standard - package list for live-helper(7)
|
||||
|
||||
## LH: Standard
|
||||
#<include> minimal
|
||||
#include <minimal>
|
||||
|
||||
console-common kbd locales
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/standard-x11 - package list for live-helper(7)
|
||||
|
||||
## LH: Standard X11
|
||||
#<include> standard
|
||||
#include <standard>
|
||||
|
||||
xorg xresprobe menu
|
||||
alsa-base alsa-oss alsa-utils
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# /usr/share/live-helper/lists/studio-gnome - package list for live-helper(7)
|
||||
|
||||
## LH: Music Studio (Gnome)
|
||||
#<include> gnome
|
||||
#<include> studio
|
||||
#include <gnome>
|
||||
#include <studio>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# /usr/share/live-helper/lists/studio-kde - package list for live-helper(7)
|
||||
|
||||
## LH: Music Studio (KDE)
|
||||
#<include> kde
|
||||
#<include> studio
|
||||
#include <kde>
|
||||
#include <studio>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# /usr/share/live-helper/lists/studio-xfce - package list for live-helper(7)
|
||||
|
||||
## LH: Music Studio (Xfce)
|
||||
#<include> xfce
|
||||
#<include> studio
|
||||
#include <xfce>
|
||||
#include <studio>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/xfce - package list for live-helper(7)
|
||||
|
||||
## LH: Xfce
|
||||
#<include> standard-x11
|
||||
#include <standard-x11>
|
||||
|
||||
xfce4 gdm
|
||||
desktop-base
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# /usr/share/live-helper/lists/xfce-junior - package list for live-helper(7)
|
||||
|
||||
## LH: Xfce Debian Junior
|
||||
#<include> xfce
|
||||
#<include> junior-pkgs
|
||||
#include <xfce>
|
||||
#include <junior-pkgs>
|
||||
|
||||
junior-kde junior-gnome
|
||||
|
|
|
|||
Loading…
Reference in New Issue