[debian-edu-commits] r82078 - trunk/src/desktop-profiles

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-17 11:48:42 +0000 (Sat, 17 Aug 2013)
New Revision: 82078

Modified:
   trunk/src/desktop-profiles/20desktop-profiles_activateDesktopProfiles
Log:
Undo change that seem to have been done by mistake when the japanese translation was updated.  It is not mentioned in the changelog.

Modified: trunk/src/desktop-profiles/20desktop-profiles_activateDesktopProfiles
===================================================================
--- trunk/src/desktop-profiles/20desktop-profiles_activateDesktopProfiles	2013-08-17 09:17:44 UTC (rev 82077)
+++ trunk/src/desktop-profiles/20desktop-profiles_activateDesktopProfiles	2013-08-17 11:48:42 UTC (rev 82078)
@@ -367,21 +367,18 @@
                         /etc/default/desktop-profiles \
                         "$CACHE_FILE" 2> /dev/null | \
 	       head -1) = "$CACHE_FILE"); then
-      # if the cache holds sets any profiles -> 
       # export the variable settings in the cache file after replacing 
       # the placeholders for the current variable values with said values 
       # (the location of placeholders is based on the active personalitytype)
-      if( grep = "$CACHE_FILE" > /dev/null 2>&1 ); then
-        export $(cat "$CACHE_FILE" | sed -e "s|\\\$KDEDIRS|$KDEDIRS|" \
+      export $(cat "$CACHE_FILE" | sed -e "s|\\\$KDEDIRS|$KDEDIRS|" \
                             -e "s|\\\$XDG_CONFIG_DIRS|$XDG_CONFIG_DIRS|" \
                             -e "s|\\\$XDG_DATA_DIRS|$XDG_DATA_DIRS|" \
                             -e "s|\\\$CHOICESPATH|$CHOICESPATH|" \
                             -e "s|\\\$GNUSTEP_PATHLIST|$GNUSTEP_PATHLIST|" \
 			    -e "s|\\\$UDEdir|$UDEdir|" );
     
-        # UDEdir only holds 1 dir, so drop every dir except the first nonempty one
-        export UDEdir=$(echo $UDEdir | sed 's|^:||' | cut --fields 1 --delimiter ":");
-      fi;	
+      # UDEdir only holds 1 dir, so drop every dir except the first nonempty one
+      export UDEdir=$(echo $UDEdir | sed 's|^:||' | cut --fields 1 --delimiter ":");
     # else if we have any profile kinds we're interested in, then go 
     # calculate the profile assignments
     elif (test "$ACTIVE_PROFILE_KINDS"x != "x"); then