[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/libkonq/favicons
From:       Waldo Bastian <bastian () kde ! org>
Date:       2003-11-28 12:55:15
[Download RAW message or body]

CVS commit by waba: 

Migrate favicons to new location.


  M +2 -2      favicons.upd   1.2
  M +25 -7     move_favicons.sh   1.2


--- kdebase/libkonq/favicons/favicons.upd  #1.1:1.2
@@ -1,4 +1,4 @@
-# Move favicons from $KDEHOME/share/icons to $KDEHOME/share/cache
-Id=kde3
+# Move favicons from $KDEHOME/share/icons and $KDEHOME/share/cache to $KDEHOME/cache-$HOST
+Id=kde3_2
 File=dummy
 Script=move_favicons.sh,sh

--- kdebase/libkonq/favicons/move_favicons.sh  #1.1:1.2
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-prefix=`kde-config --localprefix`
-source="$prefix/share/icons/favicons"
-dest="$prefix/share/cache/favicons"
+prefix=$(kde-config --localprefix)
+source1="$prefix/share/icons/favicons"
+source2="$prefix/share/cache/favicons"
+dest="$(kde-config --path cache)/favicons"
 
-if [ -n "$prefix" -a -d "$source" ]; then
+if [ -n "$prefix" -a -d "$source1" ]; then
         while [ ! -d "$dest" ]; do
                 dir="$dest"
@@ -14,10 +15,27 @@
         done
 
-        icons=`ls "$source" 2>/dev/null`
+        icons=`ls "$source1" 2>/dev/null`
         if [ -n "$icons" ]; then
                 for i in $icons; do
-                        mv "$source/$i" "$dest/$i"
+                        mv -f "$source1/$i" "$dest/$i"
                 done
         fi
-        rmdir "$source"
+        rmdir "$source1"
+fi
+if [ -n "$prefix" -a -d "$source2" ]; then
+        while [ ! -d "$dest" ]; do
+                dir="$dest"
+                while [ ! -d `dirname "$dir"` ]; do
+                        dir=`dirname "$dir"`
+                done
+                mkdir "$dir" || exit 1
+        done
+
+        icons=`ls "$source2" 2>/dev/null`
+        if [ -n "$icons" ]; then
+                for i in $icons; do
+                        mv -f "$source2/$i" "$dest/$i"
+                done
+        fi
+        rmdir "$source2"
 fi


[prev in list] [next in list] [prev in thread] [next in thread]