← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gksu/hardy-proposed

« back to all changes in this revision

Viewing changes to gksu-migrate-conf.sh

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2006-11-22 16:37:57 UTC
  • mfrom: (0.1.7 upstream) (1.1.2 etch)
  • Revision ID: james.westby@ubuntu.com-20061122163757-rbvo3fy0fyofj1ln
Tags: 2.0.0-1ubuntu1
* Merge from debian unstable. 
* Remaining changes:
  - debian/patches/14_set_http_proxy_env.patch: 
    + set http_proxy environment from gconf 
  - debian/patches/07_desktop_in_ship.patch: 
    + don't display root-terminal menu entry

Show diffs side-by-side

added added

removed removed

Lines of Context:
gksu-migrate-conf.sh
21
21
    exit 1
22
22
fi
23
23
 
24
 
value=$(grep ^force-grab $CONFFILE | head -1 | cut -d= -f2 | sed 's,#.*,,g' | tr -d '[:space:]' | tr A-Z a-z)
 
24
value=$(grep ^force-grab $CONFFILE | head -n 1 | cut -d= -f2 | sed 's,#.*,,g' | tr -d '[:space:]' | tr A-Z a-z)
25
25
if [ -n "$value" ]; then
26
26
    if [[ $value = "yes" ]]; then
27
27
        set_mandatory force-grab true
31
31
fi
32
32
 
33
33
for key in disable-grab sudo-mode prompt always-ask-password; do
34
 
    value=$(grep ^$key $CONFFILE | head -1 | cut -d= -f2 | sed 's,#.*,,g' | tr -d '[:space:]' | tr A-Z a-z)
 
34
    value=$(grep ^$key $CONFFILE | head -n 1 | cut -d= -f2 | sed 's,#.*,,g' | tr -d '[:space:]' | tr A-Z a-z)
35
35
 
36
36
    if [ -n "$value" ]; then
37
37
        if [[ $value = "yes" ]]; then