[Cdd-commits] r1196 - cdd/trunk/blends

[CDD Subversion Commit]

Author: tille
Date: Sun Nov  2 16:15:39 2008
New Revision: 1196

Added:
   cdd/trunk/blends/blend-task-lister
      - copied, changed from r1194, cdd/trunk/blends/dis-task-lister
Removed:
   cdd/trunk/blends/dis-task-lister
Modified:
   cdd/trunk/blends/blend-role.8
Log:
Renamed task-lister


Modified: cdd/trunk/blends/blend-role.8
==============================================================================
--- cdd/trunk/blends/blend-role.8	(original)
+++ cdd/trunk/blends/blend-role.8	Sun Nov  2 16:15:39 2008
@@ -1,10 +1,10 @@
-.TH blend-user 8 "2008/11/02" "" "Debian Pure Blends"
+.TH blend-role 8 "2008/11/02" "" "Debian Pure Blends"
 .SH NAME
 .B blend-role
 \- add/remove roles in registered Debian Pure Blend
 
 .SH SYNOPSIS
-.B blend-user
+.B blend-role
 .B add|del
 <
 .B Blend

Copied: cdd/trunk/blends/blend-task-lister (from r1194, cdd/trunk/blends/dis-task-lister)
==============================================================================
--- cdd/trunk/blends/dis-task-lister	(original)
+++ cdd/trunk/blends/blend-task-lister	Sun Nov  2 16:15:39 2008
@@ -1,30 +1,30 @@
 #!/bin/sh
-# This script respects its own file name to find out the DIS it belongs to
-# Names should be builded like <DIS>-task-files
+# This script respects its own file name to find out the Blend it belongs to
+# Names should be builded like <Blend>-task-files
 # The intended use is to create according symlinks to this file
 
 NAME=`basename $0`
-if [ _"$NAME" = _"dis-task-lister" ] ; then
+if [ _"$NAME" = _"blend-task-lister" ] ; then
     exit
 fi
 
-# the base dir for DIS conffiles, where script expects to find dirs named like
-# each registered DISs
-CONFBASE=${CONFBASE:-/etc/dis}
+# the base dir for Blend conffiles, where script expects to find dirs named like
+# each registered blend
+CONFBASE=${CONFBASE:-/etc/blends}
 
-# a local per DIS conf is sourced later, after argument parsing
-. ${CONFBASE}/dis.conf
+# a local per Blend conf is sourced later, after argument parsing
+. ${CONFBASE}/blends.conf
 
-DIS=`echo $NAME | sed 's/-task-files//'`
+BLEND=`echo $NAME | sed 's/-task-files//'`
 
-# Now that we know the selected DIS, we can check if there is a local
+# Now that we know the selected Blend, we can check if there is a local
 # configuration for it (ie different backend from the default one)
-test -n "${DIS}" -a  -f ${CONFBASE}/${DIS}/${DIS}.conf &&
-	. ${CONFBASE}/${DIS}/${DIS}.conf
+test -n "${BLEND}" -a  -f ${CONFBASE}/${BLEND}/${BLEND}.conf &&
+	. ${CONFBASE}/${BLEND}/${BLEND}.conf
 
 if [ -n "${DBBACKEND}" ]; then
 	set -e
-	checkDIS ${DIS} || disFail $? "Debian Integrated Solution ${DIS} does not exist"
+	checkBlend ${BLEND} || blendFail $? "Debian Pure Blend ${BLEND} does not exist"
 fi
 
 # Check consistency of passed argouments
@@ -33,4 +33,4 @@
     exit 67 # EX_USAGE
 fi
 
-cat /usr/share/dis/tasksel/${DIS}/$1
+cat /usr/share/blends/tasksel/${BLEND}/$1