Use C-style 'include' in lists (backwards compatible).

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2008-01-15 22:43:51 +00:00 · 2008-01-15 22:43:51 +00:00 · 8b59b61bb2
parent d1dd598f83
commit 8b59b61bb2
22 changed files with 28 additions and 28 deletions
--- a/functions/packageslists.sh
+++ b/functions/packageslists.sh
@ -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
--- a/lists/devel-live
+++ b/lists/devel-live
@ -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
--- a/lists/gnome
+++ b/lists/gnome
@ -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
--- a/lists/gnome-core
+++ b/lists/gnome-core
@ -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
--- a/lists/gnome-full
+++ b/lists/gnome-full
@ -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
--- a/lists/gnome-junior
+++ b/lists/gnome-junior
@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/gnome-junior - package list for live-helper(7)
 ## LH: Debian Junior (Gnome)
-#<include> gnome
+#include <gnome>
-#<include> junior-pkgs
+#include <junior-pkgs>
 junior-gnome 
--- a/lists/gnustep
+++ b/lists/gnustep
@ -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
--- a/lists/kde
+++ b/lists/kde
@ -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
--- a/lists/kde-core
+++ b/lists/kde-core
@ -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
--- a/lists/kde-extra
+++ b/lists/kde-extra
@ -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
--- a/lists/kde-full
+++ b/lists/kde-full
@ -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
--- a/lists/kde-junior
+++ b/lists/kde-junior
@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/kde-junior - package list for live-helper(7)
 ## LH: KDE Junior
-#<include> kde
+#include <kde>
-#<include> junior-pkgs
+#include <junior-pkgs>
 junior-kde
--- a/lists/knoppix
+++ b/lists/knoppix
@ -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.
--- a/lists/knoppix-dvd
+++ b/lists/knoppix-dvd
@ -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.
--- a/lists/rescue
+++ b/lists/rescue
@ -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
--- a/lists/standard
+++ b/lists/standard
@ -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
--- a/lists/standard-x11
+++ b/lists/standard-x11
@ -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
--- a/lists/studio-gnome
+++ b/lists/studio-gnome
@ -1,5 +1,5 @@
 # /usr/share/live-helper/lists/studio-gnome - package list for live-helper(7)
 ## LH: Music Studio (Gnome)
-#<include> gnome
+#include <gnome>
-#<include> studio
+#include <studio>
--- a/lists/studio-kde
+++ b/lists/studio-kde
@ -1,5 +1,5 @@
 # /usr/share/live-helper/lists/studio-kde - package list for live-helper(7)
 ## LH: Music Studio (KDE)
-#<include> kde
+#include <kde>
-#<include> studio
+#include <studio>
--- a/lists/studio-xfce
+++ b/lists/studio-xfce
@ -1,5 +1,5 @@
 # /usr/share/live-helper/lists/studio-xfce - package list for live-helper(7)
 ## LH: Music Studio (Xfce)
-#<include> xfce
+#include <xfce>
-#<include> studio
+#include <studio>
--- a/lists/xfce
+++ b/lists/xfce
@ -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
--- a/lists/xfce-junior
+++ b/lists/xfce-junior
@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/xfce-junior - package list for live-helper(7)
 ## LH: Xfce Debian Junior
-#<include> xfce
+#include <xfce>
-#<include> junior-pkgs
+#include <junior-pkgs>
 junior-kde junior-gnome