| 1 |
nixphoeni 10/05/08 19:04:04 |
| 2 |
|
| 3 |
Modified: gdesklets.eclass |
| 4 |
Log: |
| 5 |
Tried to fix bug #314653 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.19 eclass/gdesklets.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gdesklets.eclass?rev=1.19&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gdesklets.eclass?rev=1.19&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gdesklets.eclass?r1=1.18&r2=1.19 |
| 13 |
|
| 14 |
Index: gdesklets.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v |
| 17 |
retrieving revision 1.18 |
| 18 |
retrieving revision 1.19 |
| 19 |
diff -u -r1.18 -r1.19 |
| 20 |
--- gdesklets.eclass 13 May 2009 02:11:24 -0000 1.18 |
| 21 |
+++ gdesklets.eclass 8 May 2010 19:04:04 -0000 1.19 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 2004-2006 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License, v2 or later |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.18 2009/05/13 02:11:24 nixphoeni Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.19 2010/05/08 19:04:04 nixphoeni Exp $ |
| 27 |
# |
| 28 |
# Authors: Joe Sapp <nixphoeni@g.o> |
| 29 |
# Mike Gardiner <obz@g.o> |
| 30 |
@@ -54,12 +54,6 @@ |
| 31 |
# The displays only need to be readable |
| 32 |
insopts -m0744 |
| 33 |
|
| 34 |
- # Check to see if DISPLAY is set for the |
| 35 |
- # gdesklets-control-getid script to run without |
| 36 |
- # error |
| 37 |
- [ -z "${DISPLAY}" ] && DISPLAY="" |
| 38 |
- export DISPLAY |
| 39 |
- |
| 40 |
debug-print-section sensor_install |
| 41 |
# First, install the Sensor (if there is one) |
| 42 |
if [[ -n "${SENSOR_NAME}" ]]; then |
| 43 |
@@ -161,7 +155,7 @@ |
| 44 |
for CTRL in ${CONTROL_INITS[@]}; do |
| 45 |
|
| 46 |
cd `dirname ${CTRL}` |
| 47 |
- CTRL_NAME=$( "${GDESKLETS_INST_DIR}/gdesklets-control-getid" `pwd` ) |
| 48 |
+ CTRL_NAME=$( "${GDESKLETS_INST_DIR}/gdesklets-control-getid" `pwd` 2> /dev/null ) |
| 49 |
einfo "Installing Control ${CTRL_NAME}" |
| 50 |
# This creates the subdirectory of ${CTRL_NAME} |
| 51 |
# in the global Controls directory |
Archives