[Cdd-commits] r1198 - cdd/trunk/blends
CDD Subversion Commit
noreply at alioth.debian.org
Sun Nov 2 18:18:16 UTC 2008
Author: tille
Date: Sun Nov 2 18:18:15 2008
New Revision: 1198
Added:
cdd/trunk/blends/blend-update-menus
- copied, changed from r1194, cdd/trunk/blends/dis-update-menus
cdd/trunk/blends/blend-update-menus.8
- copied, changed from r1194, cdd/trunk/blends/dis-update-menus.8
Removed:
cdd/trunk/blends/dis-update-menus
cdd/trunk/blends/dis-update-menus.8
Log:
Rename update-menus
Copied: cdd/trunk/blends/blend-update-menus (from r1194, cdd/trunk/blends/dis-update-menus)
==============================================================================
--- cdd/trunk/blends/dis-update-menus (original)
+++ cdd/trunk/blends/blend-update-menus Sun Nov 2 18:18:15 2008
@@ -3,25 +3,25 @@
# $Id$
usage() {
- echo "Usage: `basename $0` [ -u <user> | -d <DIS> ]"
- echo "DIS: `getDISList|tr ' ' '|'`"
- echo "user: system user registerd to a DIS"
+ echo "Usage: `basename $0` [ -u <user> | -d <Blend> ]"
+ echo "Blend: `getBlendList|tr ' ' '|'`"
+ echo "user: system user registerd to a Blend"
echo
echo "run as user updates only the user's menu script"
}
-# 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 Blends 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
-# specific utilities for dis-update-menus
-. ${SHAREDIR}/dis-update-menus
+# specific utilities for blend-update-menus
+. ${SHAREDIR}/blend-update-menus
# Get command line arguments
-GETOPT=`getopt -o d:u:h --long dis:,user:,help -n "$0" -- "$@"`
+GETOPT=`getopt -o b:u:h --long blend:,user:,help -n "$0" -- "$@"`
eval set -- "$GETOPT"
while true
do
@@ -30,35 +30,35 @@
usage
exit 0
;;
- # get distro name
- -d|--dis)
+ # get blend name
+ -b|--blend)
if ! amI root; then
- disLog "You must be root to specify --dis parameter"
- disLog ""
+ blendLog "You must be root to specify --blend parameter"
+ blendLog ""
usage
exit 64
- elif [ -n "${DISUSER}" ]; then
- disLog "You cannot specify --dis and --user at the same time"
- disLog ""
+ elif [ -n "${BLENDUSER}" ]; then
+ blendLog "You cannot specify --blend and --user at the same time"
+ blendLog ""
usage
exit 0
else
- DIS=$2
+ BLEND=$2
shift 2
fi
;;
# get user name
-u|--user)
- DISUSER=$2
+ BLENDUSER=$2
shift 2
- if ! amI root && ! amI "${DISUSER}"; then
- disLog "You must be root to specify --user parameter with a user that's not you"
+ if ! amI root && ! amI "${BLENDUSER}"; then
+ blendLog "You must be root to specify --user parameter with a user that's not you"
usage
exit 64
- elif [ "${DISUSER}" == 'root' ]; then
- disFail 64 "err: Menus for user 'root' cannot be updated"
- elif [ -n "${DIS}" ]; then
+ elif [ "${BLENDUSER}" == 'root' ]; then
+ blendFail 64 "err: Menus for user 'root' cannot be updated"
+ elif [ -n "${BLEND}" ]; then
usage
exit 0
fi
@@ -68,42 +68,42 @@
break
;;
*)
- disLog "$1 not recognized as option" >&2
+ blendLog "$1 not recognized as option" >&2
exit 67 # EX_USAGE
;;
esac
done
-# update menu scripts for DISUSER, for any DIS, if any
-if [ -n "${DISUSER}" ]; then
- SYSSCRIPT="${SHAREDIR}/menu/dis-menu"
- USERSCRIPT="`getUserHome ${DISUSER}`/.menu/dis-menu"
+# update menu scripts for BLENDUSER, for any Blend, if any
+if [ -n "${BLENDUSER}" ]; then
+ SYSSCRIPT="${SHAREDIR}/menu/blend-menu"
+ USERSCRIPT="`getUserHome ${BLENDUSER}`/.menu/blend-menu"
set -e
- checkUser ${DISUSER} || \
- disFail 67 "User does not exist"
- isUserRegistered ${DISUSER} || \
- disFail 67 "User ${DISUSER} is not registered to any DIS"
+ checkUser ${BLENDUSER} || \
+ blendFail 67 "User does not exist"
+ isUserRegistered ${BLENDUSER} || \
+ blendFail 67 "User ${BLENDUSER} is not registered to any Blend"
# there's nothing to do on per user basis criteria
- #updateUser ${DISUSER} "${SYSSCRIPT}" "${USERSCRIPT}"
+ #updateUser ${BLENDUSER} "${SYSSCRIPT}" "${USERSCRIPT}"
set +e
-# update menu scripts for any user registered into the specified DIS
-elif [ -n "${DIS}" ]; then
- # Now that we know the selected DIS, we can check if there is a local
+# update menu scripts for any user registered into the specified Blend
+elif [ -n "${BLEND}" ]; then
+ # Now that we know the selected Blend, we can check if there is a local
# configuration for it (ie differnt 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
set -e
- checkDIS ${DIS} || \
- disFail $? "Debian Integrated Solution ${DIS} does not exist"
+ checkBlend ${BLEND} || \
+ blendFail $? "Debian Pure Blend ${BLEND} does not exist"
- # there's nothing to do on per DIS basis criteria
- #SYSSCRIPT="${SHAREDIR}/menu/dis-menu"
- #updateDIS ${DIS} "${SYSSCRIPT}"
+ # there's nothing to do on per Blend basis criteria
+ #SYSSCRIPT="${SHAREDIR}/menu/blend-menu"
+ #updateBlend ${BLEND} "${SYSSCRIPT}"
set +e
else
exec $0 --user `whoami`
Copied: cdd/trunk/blends/blend-update-menus.8 (from r1194, cdd/trunk/blends/dis-update-menus.8)
==============================================================================
--- cdd/trunk/blends/dis-update-menus.8 (original)
+++ cdd/trunk/blends/blend-update-menus.8 Sun Nov 2 18:18:15 2008
@@ -1,45 +1,45 @@
-.TH dis\-update\-menus 8 "2004/03/24" "" "Debian Integrated Solutions"
+.TH blend\-update\-menus 8 "2008/11/02" "" "Debian Pure Blends"
.SH NAME
-.B dis\-update\-menus
-\- add menu of meta package to all Debian Integrated Solution users
+.B blend\-update\-menus
+\- add menu of meta package to all Debian Pure Blend users
.SH SYNOPSIS
-.B dis\-update\-menus
-[ \-\-dis|\-d <
-.B DIS
+.B blend\-update\-menus
+[ \-\-blend|\-b <
+.B Blend
> |
\-\-user|\-u <
.B user
> ]
.SH DESCRIPTION
-dis\-update\-menus behaves differently depending on who run the command:
+blend\-update\-menus behaves differently depending on who run the command:
If it's called by a user, it adds and keeps updated menu entries for the
user who runs it.
If it's called by root, it adds and keeps updated user's menu entries
(see menu package for users' menus) for all users who belong to the
-group of the specified Debian Integrated Solution, or only for a
+group of the specified Debian Pure Blend, or only for a
specified user, depending on which parameter is passed to the script.
.SH OPTIONS
.TP
-.B DIS
-one of the installed DISs, listed in /etc/dis/, for example (if installed):
-.I med
+.B Blend
+one of the installed Blends, listed in /etc/blends/, for example (if installed):
+.I edu
,
-.I junior
+.I gis
,
-.I desktop
+.I junior
,
-.I edu
+.I med
or
-.I demudi
+.I science
.TP
.B user
-a user present on the system and belonging to a DIS
+a user present on the system and belonging to a Blend
.SH AUTHOR
Andreas Tille <tille at debian.org>, Cosimo Alfarano <kalfa at debian.org>
More information about the Cdd-commits
mailing list