[debian-edu-commits] debian-edu/ 48/183: Make profile-kind be the 2nd field instead of the 5th to improve readability, as requested by Mathhew McGuire Also do automatic conversion from old format.
Alexander Alemayhu
ccscanf-guest at moszumanska.debian.org
Wed Jun 11 16:48:32 UTC 2014
This is an automated email from the git hooks/post-receive script.
ccscanf-guest pushed a commit to branch master
in repository desktop-profiles.
commit f67c40ad3c1e74a39c14a837bfb00e5aa93fbc40
Author: Bart Cornelis <cobaco at linux.be>
Date: Fri Feb 4 10:49:22 2005 +0000
Make profile-kind be the 2nd field instead of the
5th to improve readability, as requested by Mathhew McGuire
Also do automatic conversion from old format.
---
20desktop-profiles_activateDesktopProfiles | 36 +++++++++++++++---------------
TODO | 4 ----
debian/changelog | 9 ++++++++
debian/listing | 30 ++++++++++++-------------
desktop-profiles | 2 +-
desktop-profiles.7 | 12 +++++-----
dh_installlisting | 12 +---------
listingmodule | 14 ++++++------
profile-manager.kmdr | 12 +++++-----
9 files changed, 63 insertions(+), 68 deletions(-)
diff --git a/20desktop-profiles_activateDesktopProfiles b/20desktop-profiles_activateDesktopProfiles
index bf645d1..1586fc6 100644
--- a/20desktop-profiles_activateDesktopProfiles
+++ b/20desktop-profiles_activateDesktopProfiles
@@ -50,21 +50,21 @@ sort_profiles(){
# changed are in a subshell, which means they're unchanged outside the while loop)
while read PROFILE <&3; do
# sort per profile kind
- KIND=`echo "$PROFILE" | cut --fields 5 --delimiter ";"`;
+ KIND=`echo "$PROFILE" | cut --fields 2 --delimiter ";"`;
if (test "$KIND" = "KDE"); then
- KDEDIRS="$KDEDIRS $(echo "$PROFILE" | cut --fields 2 --delimiter ";")";
+ KDEDIRS="$KDEDIRS $(echo "$PROFILE" | cut --fields 3 --delimiter ";")";
elif (test "$KIND" = "XDG_CONFIG"); then
- XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS $(echo "$PROFILE" | cut --fields 2 --delimiter ";")";
+ XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS $(echo "$PROFILE" | cut --fields 3 --delimiter ";")";
elif (test "$KIND" = "XDG_DATA"); then
- XDG_DATA_DIRS="$XDG_DATA_DIRS $(echo "$PROFILE" | cut --fields 2 --delimiter ";")";
+ XDG_DATA_DIRS="$XDG_DATA_DIRS $(echo "$PROFILE" | cut --fields 3 --delimiter ";")";
elif (test "$KIND" = "ROX"); then
- CHOICESPATH="$CHOICESPATH $(echo "$PROFILE" | cut --fields 2 --delimiter ";")";
+ CHOICESPATH="$CHOICESPATH $(echo "$PROFILE" | cut --fields 3 --delimiter ";")";
elif (test "$KIND" = "GNUSTEP"); then
- GNUSTEP_PATHLIST="$GNUSTEP_PATHLIST $(echo "$PROFILE" | cut --fields 2 --delimiter ";")";
+ GNUSTEP_PATHLIST="$GNUSTEP_PATHLIST $(echo "$PROFILE" | cut --fields 3 --delimiter ";")";
elif (test "$KIND" = "UDE"); then
- UDEDIRS="$UDEDIRS $(echo "$PROFILE" | cut --fields 2 --delimiter ";")";
+ UDEDIRS="$UDEDIRS $(echo "$PROFILE" | cut --fields 3 --delimiter ";")";
elif (test "$KIND" = "GCONF"); then
- echo "`echo "$PROFILE" | cut --fields 2 --delimiter ";"` " >> $GCONF_FILE;
+ echo "`echo "$PROFILE" | cut --fields 3 --delimiter ";"` " >> $GCONF_FILE;
fi;
done;
@@ -79,7 +79,7 @@ sort_profiles(){
activate_KDE () {
KDEDIRS=`echo "$KDEDIRS" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`
if (test "$KDEDIRS"x != x) &&
- (test "$KDEDIRS" != "`cat $DEFAULT_LISTING | grep "^kde-prefix" | cut --fields 2 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`"); then
+ (test "$KDEDIRS" != "`cat $DEFAULT_LISTING | grep "^kde-prefix" | cut --fields 3 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`"); then
KDEDIRS=$(sh -c "echo $KDEDIRS");# FORCE expansion of variables in KDEDIRS if any
export KDEDIRS;
fi;
@@ -88,7 +88,7 @@ activate_KDE () {
activate_XDG_CONFIG () {
XDG_CONFIG_DIRS=`echo "$XDG_CONFIG_DIRS" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`
if (test "$XDG_CONFIG_DIRS"x != x) &&
- (test "$XDG_CONFIG_DIRS" != "`cat $DEFAULT_LISTING | grep "^default-xdg_config_dirs" | cut --fields 2 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`"); then
+ (test "$XDG_CONFIG_DIRS" != "`cat $DEFAULT_LISTING | grep "^default-xdg_config_dirs" | cut --fields 3 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`"); then
XDG_CONFIG_DIRS=$(sh -c "echo $XDG_CONFIG_DIRS");# FORCE expansion of variables in XDG_CONFIG_DIRS if any
export XDG_CONFIG_DIRS;
fi;
@@ -97,7 +97,7 @@ activate_XDG_CONFIG () {
activate_XDG_DATA () {
XDG_DATA_DIRS=`echo "$XDG_DATA_DIRS" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`
if (test "$XDG_DATA_DIRS"x != x) &&
- (test "$XDG_DATA_DIRS" != "`cat $DEFAULT_LISTING | grep "^default-xdg_data_dirs" | cut --fields 2 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`"); then
+ (test "$XDG_DATA_DIRS" != "`cat $DEFAULT_LISTING | grep "^default-xdg_data_dirs" | cut --fields 3 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`"); then
XDG_DATA_DIRS=$(sh -c "echo $XDG_DATA_DIRS");# FORCE expansion of variables in XDG_DATA_DIRS if any
export XDG_DATA_DIRS;
fi;
@@ -105,8 +105,8 @@ activate_XDG_DATA () {
activate_ROX () {
CHOICESPATH=`echo "$CHOICESPATH" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`
- DEFAULT_CHOICES=$(cat $DEFAULT_LISTING | grep '^default-rox-system;' | cut --field 2 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g")
- DEFAULT_CHOICES="$(cat $DEFAULT_LISTING | grep '^default-rox-user;' | cut --field 2 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"):$DEFAULT_CHOICES"
+ DEFAULT_CHOICES=$(cat $DEFAULT_LISTING | grep '^default-rox-system;' | cut --field 3 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g")
+ DEFAULT_CHOICES="$(cat $DEFAULT_LISTING | grep '^default-rox-user;' | cut --field 3 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"):$DEFAULT_CHOICES"
if (test "$CHOICESPATH"x != x) &&
(test "$CHOICESPATH" != "$DEFAULT_CHOICES"); then
CHOICESPATH=$(sh -c "echo $CHOICESPATH");# FORCE expansion of variables in CHOICESPATH if any
@@ -118,7 +118,7 @@ activate_UDE () {
# don't s/ /:g/ in next line, UDE doesn't currently support combining profile dirs
UDEDIRS=`echo "$UDEDIRS" | sed -e "s/^ *//" -e "s/ *$//"`
if (test "$UDEDIRS"x != x) &&
- (test "$UDEDIRS" != "`cat $DEFAULT_LISTING | grep "^ude-install-dir" | cut --fields 2 --delimiter ";"`"); then
+ (test "$UDEDIRS" != "`cat $DEFAULT_LISTING | grep "^ude-install-dir" | cut --fields 3 --delimiter ";"`"); then
# Take first dir and break, as UDE currently only supports one dir
for dir in $UDEDIRS; do
UDEdir=$dir;
@@ -139,10 +139,10 @@ activate_GNUSTEP () {
GNUSTEP_PATHLIST=`echo "$GNUSTEP_PATHLIST" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`
# get default domains
- DEFAULT_DOMAINS=$(cat $DEFAULT_LISTING | grep "^gnustep-user-domain" | cut --fields 2 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g")
- DEFAULT_DOMAINS="$DEFAULT_DOMAINS:$(cat $DEFAULT_LISTING | grep "^gnustep-local-domain" | cut --fields 2 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g")"
- DEFAULT_DOMAINS="$DEFAULT_DOMAINS:$(cat $DEFAULT_LISTING | grep "^gnustep-network-domain" | cut --fields 2 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g")"
- DEFAULT_DOMAINS="$DEFAULT_DOMAINS:$(cat $DEFAULT_LISTING | grep "^gnustep-system-domain" | cut --fields 2 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g")"
+ DEFAULT_DOMAINS=$(cat $DEFAULT_LISTING | grep "^gnustep-user-domain" | cut --fields 3 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g")
+ DEFAULT_DOMAINS="$DEFAULT_DOMAINS:$(cat $DEFAULT_LISTING | grep "^gnustep-local-domain" | cut --fields 3 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g")"
+ DEFAULT_DOMAINS="$DEFAULT_DOMAINS:$(cat $DEFAULT_LISTING | grep "^gnustep-network-domain" | cut --fields 3 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g")"
+ DEFAULT_DOMAINS="$DEFAULT_DOMAINS:$(cat $DEFAULT_LISTING | grep "^gnustep-system-domain" | cut --fields 3 --delimiter ";" | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g")"
if (test "$GNUSTEP_PATHLIST"x != x) &&
(test "$GNUSTEP_PATHLIST" != "$DEFAULT_DOMAINS"); then
diff --git a/TODO b/TODO
index a6bf302..87e957d 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,8 @@
- Finish package:
- - add kiosktool to Suggests when it becomes available in Debian (can i suggest
- something not yet in the archive?)
-
- Are there any docs on the kiosk system of XFCE 4.2 available anywhere we can
point to? XFCE kiosk system possibilities are still very limited:
-> panel: http://www.loculus.nl/xfce/documentation/docs-4.2/xfce4-panel.html#panel-kiosk
-> xfce4-session:
-
- Tools to build (cross-desktop) profiles? (if at all possible)
- background
diff --git a/debian/changelog b/debian/changelog
index 6299ab1..8b08132 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+desktop-profiles (1.4-1) unstable; urgency=low
+
+ * Format change in the .listing files: more particularely make profile KIND
+ be the 2nd field instead of the 5th. As pointed out by Matthew McGuire
+ <gray at shadowglade.net> this makes things more readable. Automatic
+ conversion of old .listing files in /etc/desktop-profiles is provided.
+
+ -- Bart Cornelis (cobaco) <cobaco at linux.be> Thu, 3 Feb 2005 17:34:38 +0100
+
desktop-profiles (1.3-2) unstable; urgency=low
* Documented in man page that profile name should be unique within each
diff --git a/debian/listing b/debian/listing
index fc5d7ae..3f5119d 100644
--- a/debian/listing
+++ b/debian/listing
@@ -15,23 +15,23 @@
# See the desktop-profiles (7) man page for details about the format of this
# file, and how it will be used
################################################################################
-kde-prefix;/usr;;;KDE;System-wide kde stuff on Debian (stuff in PREFIX)
+kde-prefix;KDE;/usr;;;System-wide kde stuff on Debian (stuff in PREFIX)
-default-xdg_config_dirs;/etc/xdg;;;XDG_CONFIG;Default config location defined by XDG Base Directory Specification
-default-xdg_data_dirs;/usr/local/share /usr/share;;;XDG_DATA;Default data locations defined by XDG Base Directory Specification
+default-xdg_config_dirs;XDG_CONFIG;/etc/xdg;;;Default config location defined by XDG Base Directory Specification
+default-xdg_data_dirs;XDG_DATA;/usr/local/share /usr/share;;;Default data locations defined by XDG Base Directory Specification
-default-rox-system;/usr/local/share/Choices:/usr/share/rox/Choices;;;ROX;Default locations for non-user settings of ROX programs on Debian
-default-rox-user;${HOME}/.rox_choices;999999999999999999;;ROX;ROX user settings on Debian (should normally take precedence over everything else)
+default-rox-system;ROX;/usr/local/share/Choices:/usr/share/rox/Choices;;;Default locations for non-user settings of ROX programs on Debian
+default-rox-user;ROX;${HOME}/.rox_choices;999999999999999999;;ROX user settings on Debian (should normally take precedence over everything else)
-ude-install-dir;/usr/share/ude;;;UDE;Default location of system-wide UDE stuff
+ude-install-dir;UDE;/usr/share/ude;;;Default location of system-wide UDE stuff
-gnustep-user-domain;${GNUSTEP_USER_ROOT};30;;GNUSTEP;Default location of user domain, evaluates to ~/GNUstep by default
-gnustep-local-domain;${GNUSTEP_LOCAL_ROOT};20;;GNUSTEP;Default location of local domain, evaluates to /usr/local/lib/GNUstep/Local by default
-gnustep-network-domain;${GNUSTEP_NETWORK_ROOT};10;;GNUSTEP;Default location of network domain, evaluates to /usr/local/lib/GNUstep/Network by default
-gnustep-system-domain;${GNUSTEP_SYSTEM_ROOT};0;;GNUSTEP;Default location of system domain, evaluates to /usr/lib/GNUstep/System by default
+gnustep-user-domain;GNUSTEP;${GNUSTEP_USER_ROOT};30;;Default location of user domain, evaluates to ~/GNUstep by default
+gnustep-local-domain;GNUSTEP;${GNUSTEP_LOCAL_ROOT};20;;Default location of local domain, evaluates to /usr/local/lib/GNUstep/Local by default
+gnustep-network-domain;GNUSTEP;${GNUSTEP_NETWORK_ROOT};10;;Default location of network domain, evaluates to /usr/local/lib/GNUstep/Network by default
+gnustep-system-domain;GNUSTEP;${GNUSTEP_SYSTEM_ROOT};0;;Default location of system domain, evaluates to /usr/lib/GNUstep/System by default
-gconf-mandatory;xml:readonly:/etc/gconf/gconf.xml.mandatory;101;;GCONF;Configuration source with the mandatory system-wide settings
-gconf-sysadmin-mandatory;include /etc/gconf/2/local-mandatory.path;100;;GCONF;Extra mandatory settings defined by sysadmin
-gconf-user;xml:readwrite:$(HOME)/.gconf;50;;GCONF;The normal user configuration source
-gconf-sysadmin-defaults;include /etc/gconf/2/local-defaults.path;-1;;GCONF;Extra default settings defined by sysadmin
-gconf-defaults;xml:readonly:/etc/gconf/gconf.xml.defaults;-2;;GCONF;Configuration source with the default systemwide settings
+gconf-mandatory;GCONF;xml:readonly:/etc/gconf/gconf.xml.mandatory;101;;Configuration source with the mandatory system-wide settings
+gconf-sysadmin-mandatory;GCONF;include /etc/gconf/2/local-mandatory.path;100;;Extra mandatory settings defined by sysadmin
+gconf-user;GCONF;xml:readwrite:$(HOME)/.gconf;50;;The normal user configuration source
+gconf-sysadmin-defaults;GCONF;include /etc/gconf/2/local-defaults.path;-1;;Extra default settings defined by sysadmin
+gconf-defaults;GCONF;xml:readonly:/etc/gconf/gconf.xml.defaults;-2;;Configuration source with the default systemwide settings
diff --git a/desktop-profiles b/desktop-profiles
index 86c1211..1f071f6 100644
--- a/desktop-profiles
+++ b/desktop-profiles
@@ -66,5 +66,5 @@ ACTIVE_PROFILE_KINDS="KDE XDG_CONFIG XDG_DATA GCONF GNUSTEP ROX UDE"
# the profile, while FILE refers to the .listing file the profile is in.
#
# Characters interpreted specially by the shell (such as ';') need escaping.
-#FORMAT='$NAME\;$DESCRIPTION\;$PRECEDENCE\;$REQUIREMENTS\;$KIND\;$DESCRIPTION'
+#FORMAT='$NAME\;$KIND\;$DESCRIPTION\;$PRECEDENCE\;$REQUIREMENTS\;$DESCRIPTION'
diff --git a/desktop-profiles.7 b/desktop-profiles.7
index 788f1c6..ac3d119 100644
--- a/desktop-profiles.7
+++ b/desktop-profiles.7
@@ -31,18 +31,21 @@ Empty lines and lines starting with \'#\' (i.e. comment lines) are ignored. All
.B 1st field
: Name of the profile, arbitrary, must be unique within each file, and may (but probably should not) be empty.
.IP \(bu 4
-.B 2nd field:
+.B 2nd field
+: The kind of profile, must be set, must be one of: KDE, XDG_CONFIG, XDG_DATA, GCONF, ROX, GNUSTEP, or UDE.
+.IP \(bu 4
+.B 3th field:
.IP
Location of the root of the profile directory tree, may contain more then 2 directory (in which case directies should be separated with spaces). Environment variables may be used when specifying root directories (e.g. $HOME/.extra_config).
.IP
Except for Gconf profiles, which use the this field to contain exactly one directive to be included in the generated path file (directives are either \'xml:(readonly|readwrite):<profile-root>\', or \'include <some-path-file>' ).
.IP \(bu 4
-.B 3th field
+.B 4th field
: A Numeric precedence value for the profile, may be empty (which is treated as lowest possible precedence).
.IP
When 2 (or more) active profiles define a setup for the same thing, the value specified by the profile with the highest precedence value is used (UDE will onlyuse values from the highest ranked profile).
.IP \(bu 4
-.B 4th field
+.B 5th field
: Space separated list of conditions that need to be met to activate the profiles (if more then 1 condition is specified all conditions need to be met to activate the profile).
.IP
There are 3 different kinds of requirements:
@@ -57,9 +60,6 @@ There are 3 different kinds of requirements:
.IP
(Where <command> is an arbitrary shell command)
.IP \(bu 4
-.B 5th field
-: The kind of profile, must be set, must be one of: KDE, XDG_CONFIG, XDG_DATA, GCONF, ROX, GNUSTEP, or UDE.
-.IP \(bu 4
.B 6th field
: A description of what the profile is/does, may be empty.
.IP
diff --git a/dh_installlisting b/dh_installlisting
index 2c82cd1..5fc81bd 100755
--- a/dh_installlisting
+++ b/dh_installlisting
@@ -65,22 +65,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
doit("install","-p","-m644",$file,"$tmp/etc/desktop-profiles/$package.listing");
}
- #if we hadn't encountered a listing containing GNUSTEP profiles yet check for them now
- if ($containsGNUSTEP eq 'false') {
- if (`grep -v -e "^[[:space:]]*#" -e "^[[:space:]]*\$" debian/listing | cut -f 5 -d ';' | grep GNUSTEP` ne '') {
- $containsGNUSTEP='true';
- }
- }
}
}
# Add desktop-profiles to the dependencies if necesary
if ($package ne 'desktop-profiles') {
- if ($containsGNUSTEP ne 'false') {# GNUSTEP profiles were only supported starting version 1.3.
- addsubstvar($package, "misc:Depends", "desktop-profiles (>= 1.3)");
- } else {#if listing contains no GNUSTEP profiles
- addsubstvar($package, "misc:Depends", "desktop-profiles (>= 1.2)");
- }
+ addsubstvar($package, "misc:Depends", "desktop-profiles (>= 1.4)");
}
}
diff --git a/listingmodule b/listingmodule
index 63882c0..cde45c1 100644
--- a/listingmodule
+++ b/listingmodule
@@ -137,7 +137,7 @@ for_each_requirement(){
# returns 1 otherwise
###############################################################################
test_profile_requirements() {
- PROFILE_REQUIREMENTS="`echo $@ | cut --fields 4 --delimiter ";"`";
+ PROFILE_REQUIREMENTS="`echo $@ | cut --fields 5 --delimiter ";"`";
# no requirements -> met
if (test "$PROFILE_REQUIREMENTS"x = x); then
@@ -214,7 +214,7 @@ filter_listings () {
OUR_USER=${OUR_USER:-''}
- FORMAT=${FORMAT:-'$NAME\;$LOCATION\;$PRECEDENCE\;$REQUIREMENTS\;$KIND\;$DESCRIPTION'};
+ FORMAT=${FORMAT:-'$NAME\;$KIND\;$LOCATION\;$PRECEDENCE\;$REQUIREMENTS\;$DESCRIPTION'};
LISTINGS_LIST=$(list_listings)
@@ -223,13 +223,13 @@ filter_listings () {
while read PROFILE; do
# split fields
export NAME="`echo $PROFILE | cut --delimiter ';' --fields 1`";
- export LOCATION="`echo $PROFILE | cut --delimiter ';' --fields 2`";
- export PRECEDENCE="`echo $PROFILE | cut --delimiter ';' --fields 3`";
- export REQUIREMENTS="`echo $PROFILE | cut --delimiter ';' --fields 4`";
- export KIND="`echo $PROFILE | cut --delimiter ';' --fields 5`";
+ export KIND="`echo $PROFILE | cut --delimiter ';' --fields 2`";
+ export LOCATION="`echo $PROFILE | cut --delimiter ';' --fields 3`";
+ export PRECEDENCE="`echo $PROFILE | cut --delimiter ';' --fields 4`";
+ export REQUIREMENTS="`echo $PROFILE | cut --delimiter ';' --fields 5`";
export DESCRIPTION="`echo $PROFILE | cut --delimiter ';' --fields 6`";
- export FILE=`cat $LISTINGS_LIST | grep -l "^$NAME;"`;
+ export FILE=`grep -l "^$NAME;" $LISTINGS_LIST`;
if (test "$PRECEDENCE"x = x); then
#unset = lower then anything, so set to insanely low value
diff --git a/profile-manager.kmdr b/profile-manager.kmdr
index 8a4880a..c2ec2c0 100644
--- a/profile-manager.kmdr
+++ b/profile-manager.kmdr
@@ -68,7 +68,7 @@
<string>true
@setGlobal(tmp, at exec(tempfile))
- at exec(list-desktop-profiles --entry-format '$FILE\;$NAME\;$LOCATION\;$PRECEDENCE\;$REQUIREMENTS\;$KIND\;$DESCRIPTION' @filters > @global(tmp))
+ at exec(list-desktop-profiles --entry-format '$FILE\;$NAME\;$KIND\;$LOCATION\;$PRECEDENCE\;$REQUIREMENTS\;$DESCRIPTION' @filters > @global(tmp))
@profilesAll.setText(@exec(cat @global(tmp)))
@profiles.setText(@exec("cat @global(tmp) | cut --fields 2,7 --delimiter ';' | sed 's/;/ - /' "));
@@ -1364,7 +1364,7 @@ fi
FILE="$(echo '@profilesAll.selection' | cut --fields 1 --delimiter ';')"
NAME="$(echo '@profilesAll.selection' | cut --fields 2 --delimiter ';')"
-REQS="$(grep ^$NAME $FILE | cut --fields 4 --delimiter ';')"
+REQS="$(grep ^$NAME $FILE | cut --fields 5 --delimiter ';')"
for_each_requirement "$REQS" 'echo'
@execEnd</string>
@@ -1924,7 +1924,7 @@ REQS="@requirementsCurrent";
KIND="@kindCurrent";
DESC="@descriptionCurrent";
-NEW="$NAME;$LOCATION;$PRECEDENCE;$REQS;$KIND;$DESC"
+NEW="$NAME;$KIND;$LOCATION;$PRECEDENCE;$REQS;$DESC"
# changing existing profile
if (test "$IS_NEW" = "false"); then
@@ -1980,9 +1980,9 @@ fi;</string>
@profilesAll.setCurrentItem(@profiles.findItem(@profiles.selection))
@nameCurrent.setText(@exec(echo '@profilesAll.selection' | cut --fields 2 --delimiter ';'))
- at locationCurrent.setText(@exec(echo '@profilesAll.selection' | cut --fields 3 --delimiter ';'))
- at precedenceCurrent.setText(@exec(echo '@profilesAll.selection' | cut --fields 4 --delimiter ';'))
- at kindCurrent.setSelection(@exec(echo '@profilesAll.selection' | cut --fields 6 --delimiter ';'))
+ at kindCurrent.setSelection(@exec(echo '@profilesAll.selection' | cut --fields 3 --delimiter ';'))
+ at locationCurrent.setText(@exec(echo '@profilesAll.selection' | cut --fields 4 --delimiter ';'))
+ at precedenceCurrent.setText(@exec(echo '@profilesAll.selection' | cut --fields 5 --delimiter ';'))
@descriptionCurrent.setText(@exec(echo '@profilesAll.selection' | cut --fields 7 --delimiter ';'))
@isNew.setChecked(false)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/desktop-profiles.git
More information about the debian-edu-commits
mailing list