Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func
===================================================================
--- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func	(revision 5925)
+++ 	(revision )
@@ -1,30 +1,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------
-#   ------------     Funktionsbibliothek Installer      --------------
-#   ------------           emu_install.biblo            --------------
-#   ------------        Version 0.51 20.12.2008         --------------
-# ----------------------------------------------------------------------
-
-cp_r()
-{
-
-if [ `expr match "$1" './'` -gt 0 ]; then 
-  quelle="`echo $1 | sed s-[.]/-$PWD-`"
-  tr="$quelle"
-else
-  quelle="$1"
-  tr="`echo $1 | sed s-"/$"--`"
-fi
-
-ziel="$2"
-list="`ls -AFR $quelle |grep ^/ |sed 's-:-- ; s-\([^/]\)$-\1/-'`"
-
-for i in $list ; do
-  ziel2="`echo $i | sed s-$tr/--`"
-  mkdir -p $ziel$ziel2 2> /dev/null
-  cp -f $i* $ziel$ziel2 2> /dev/null
-  cp -f ${i}.* $ziel$ziel2 2> /dev/null
-done
-
-}
-
Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/do_link.sh
===================================================================
--- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/do_link.sh	(revision 5925)
+++ 	(revision )
@@ -1,7 +1,0 @@
-LIST=`ls -1 /var/swap/extensions`
-for ROUND in $LIST; do
-	if [ ! -e /usr/lib/enigma2/python/Plugins/Extensions/"$ROUND" ]; then
-		ln -s "/var/swap/extensions/$ROUND" /usr/lib/enigma2/python/Plugins/Extensions/"$ROUND"
-	fi
-done
-
Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/emu_install.biblo
===================================================================
--- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/emu_install.biblo	(revision 5925)
+++ 	(revision )
@@ -1,201 +1,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------
-#   ------------     Funktionsbibliothek Installer      --------------
-#   ------------           emu_install.biblo            --------------
-#   ------------        Version 0.51 20.12.2008         --------------
-# ----------------------------------------------------------------------
-
-cp_r()
-{
-
-if [ `expr match "$1" './'` -gt 0 ]; then 
-  quelle="`echo $1 | sed s-[.]/-$PWD-`"
-  tr="$quelle"
-else
-  quelle="$1"
-  tr="`echo $1 | sed s-"/$"--`"
-fi
-
-ziel="$2"
-list="`ls -AFR $quelle |grep ^/ |sed 's-:-- ; s-\([^/]\)$-\1/-'`"
-
-for i in $list ; do
-  ziel2="`echo $i | sed s-$tr/--`"
-  mkdir -p $ziel$ziel2 2> /dev/null
-  cp -f $i* $ziel$ziel2 2> /dev/null
-  cp -f ${i}.* $ziel$ziel2 2> /dev/null
-done
-
-}
-
-install_addon()
-{
-
-Download_Path="/tmp/aaf"
-Tarname=$1
-
-    # Pfad setzen 
-    mkdir -p $Download_Path 2> /dev/null
-    cd $Download_Path 2> /dev/null
-
-    if [ `expr match "$Tarname" '.*\.gz'` -gt 0 ]; then
-        tar -xzf $Tarname 2> /dev/null
-        zipfile=1
-    fi
-      	
-    if [ `expr match "$Tarname" '.*\.bz2'` -gt 0 ]; then
-        tar -xjf $Tarname 2> /dev/null
-        zipfile=1
-    fi
-
-
-    rm  $Tarname 2> /dev/null
-
-    # ein Download aus der Database ist gewaehlt
-    if [ $zipfile -ne 0 ]; then
-    
-        # suche Install Anweisung und fuehre sie aus
-        if [ -f $Download_Path/inst.sh ] ; then
-           
-           # File ausfhren
-           $Download_Path/inst.sh 2> /dev/null
-           
-           # und alles wegloeschen
-           rm -r $Download_Path  2> /dev/null
-        else
-            # kopiere die absoluten Pfade ins Ziel
-            cp_r $Download_Path/ / 2> /dev/null
-
-            # ist es ein Emu, dann starte noch Shells
-           if [ -e $Download_Path/var/etc/emu*.txt ] ; then
-                # Emu starten
-                echo vorbereitet
-           fi
-           
-           rm -r $Download_Path 2> /dev/null
-        fi
-    fi
-}    
-
-
-insert_menu()
-{
-# ----------------------------------------------------------------------
-#   ------------     installiert Menuezeile in cfg      --------------
-# ----------------------------------------------------------------------
-
-#Configfile=fun.cfg
-#Dir=Fun
-#Inserttext="U:Fun/fussball_info/fussball_main:Fussball Tabellen,Ergebnisse,Infos:/usr/lib/enigma2/python/AAF/Menu/Fun/fussball_info_mf.sh:mainmenu"
-# Aufruf: insert_menu $Configfile $Dir $Inserttext
-
-Configfile=${1}
-Dir=${2}
-Inserttext=${3}
-
-fantastic="/usr/lib/enigma2/python/AAF/Menu"
-Configfile="/"$Configfile
-Configfile=$fantastic/$Dir$Configfile
-
-if [ ! -e $Dir ]; then
-  mkdir -p $fantastic/$Dir 2> /dev/null
-fi
-
-if [ `grep "${Inserttext}" $Configfile | wc -l` -eq 0 ]; then
-   echo "Patching $Configfile"
-   echo "${Inserttext}" >> $Configfile
-else
- echo "Kommandozeile ist bereits vorhanden!"
-fi
-}
-
-remove_menu()
-{
-# ----------------------------------------------------------------------
-#   ------------     entfernt Menuezeile aus cfg       --------------
-# ----------------------------------------------------------------------
-
-# Configfile=fun.cfg
-# Dir=Fun
-# Inserttext="U:Fun/fussball_info/fussball_main:Fussball Tabellen,Ergebnisse,Infos:/usr/lib/enigma2/python/AAF/Menu/Fun/fussball_info_mf.sh:mainmenu"
-# Aufruf: remove_menu $Configfile $Dir $Inserttext
-
-Configfile=${1}
-Dir=${2}
-Inserttext=${3}
-
-fantastic="/usr/lib/enigma2/python/AAF/Menu"
-Configfile="/"$Configfile
-Configfile=$fantastic/$Dir$Configfile
-
-if [ ! -e $Dir ]; then
-  mkdir -p $fantastic/$Dir
-fi
-
-if [ `grep "${Inserttext}" $Configfile | wc -l` -eq 0 ]; then
-   echo "Kommandozeile ist nicht vorhanden!"
-else
-   cp $Configfile /tmp/men.tmp
-   sed "s@${Inserttext}@@" /tmp/men.tmp > $Configfile
-fi
-}
-
-url_check()
-{
-# ----------------------------------------------------------------------
-#   ----------     Url Check welcher Server aktiv ist       ----------
-# ----------------------------------------------------------------------
-# Prim. Url laden
-if [ -e /var/etc/.quellen.cfg ]; then
-  . /var/etc/.quellen.cfg
-  # Url merken
-  ORGSOURCE=$SOURCE
-else
-  echo URL-ERROR `date +%d_%m_%Y_%H_%M` Script=addon-man.sh >>/var/log/script.log
-  exit 1
-fi
-
-if [ -e /tmp/wget.txt ]; then
-  rm /tmp/wget.txt
-fi
-
-# Test erster Server
-wget -O /tmp/wget.txt $SOURCE/ufs-e2/index.txt 2> /dev/null
-
-if [ -e /tmp/wget.txt ]; then
-    echo "Actice Server = Primary Server"
-  else
-    # Test zweiter Server
-    wget -O /tmp/wget.txt $SOURCE2/ufs-e2/index.txt 2> /dev/null
-    if [ -e /tmp/wget.txt ]; then
-      SOURCE=$SOURCE2
-      echo "Actice Server = Secondary Server"
-    fi
-fi
-}
-
-# ----------------------------------------------------------------------
-#     --- Pruefe Geschwindigkeit, Testfile laden und vergleichen  ---
-# ----------------------------------------------------------------------
-check_speed () {
-webpath=$1
-. /var/etc/.quellen2.cfg
-
-read text <$webpath/info.txt
-Para1=`expr substr "$text" 15 7`
-Test1=`expr substr "$text" 8 5`
-wget -O /var/versionsinfo.txt $SOURCE/versionsinfo.txt 2>/dev/null
-read Test2 </var/versionsinfo.txt
-Para2=$Test1$Test2
-
-if [ "$Para1" = "1000" ]; then
-  DownSpeed=15
-  else
-  if [ "$Para2" = "500" ]; then
-    DownSpeed=7
-  fi
-fi
-
-Url="`echo $SOURCE | sed -e 's/^.*http:\/\///'`"
-Url="${Para1}:${Para2}@"$Url
- }
Index: /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/keymap.xml
===================================================================
--- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/keymap.xml	(revision 5926)
+++ /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/keymap.xml	(revision 5926)
@@ -0,0 +1,42 @@
+<keymap>
+	<map context="AAFKeyActions">
+		<key id="KEY_UP" mapto="up" flags="m" />
+		<key id="KEY_DOWN" mapto="down" flags="m" />
+		<key id="KEY_LEFT" mapto="left" flags="m" />
+		<key id="KEY_RIGHT" mapto="right" flags="m" />
+
+		<key id="KEY_UP" mapto="upRepeated" flags="r" />
+		<key id="KEY_DOWN" mapto="downRepeated" flags="r" />
+		<key id="KEY_LEFT" mapto="leftRepeated" flags="r" />
+		<key id="KEY_RIGHT" mapto="rightRepeated" flags="r" />
+
+		<key id="KEY_RED" mapto="red" flags="m" />
+		<key id="KEY_GREEN" mapto="green" flags="m" />
+		<key id="KEY_YELLOW" mapto="yellow" flags="m" />
+		<key id="KEY_BLUE" mapto="blue" flags="m" />
+
+		<key id="KEY_1" mapto="1" flags="m" />
+		<key id="KEY_2" mapto="2" flags="m" />
+		<key id="KEY_3" mapto="3" flags="m" />
+		<key id="KEY_4" mapto="4" flags="m" />
+		<key id="KEY_5" mapto="5" flags="m" />
+		<key id="KEY_6" mapto="6" flags="m" />
+		<key id="KEY_7" mapto="7" flags="m" />
+		<key id="KEY_8" mapto="8" flags="m" />
+		<key id="KEY_9" mapto="9" flags="m" />
+		<key id="KEY_0" mapto="0" flags="m" />
+
+		<key id="KEY_CHANNELUP" mapto="chup" flags="mr" />
+		<key id="KEY_CHANNELDOWN" mapto="chdown" flags="mr" />
+
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_PAGEUP" mapto="nextBouquet" flags="m" />
+		<key id="KEY_PAGEDOWN" mapto="prevBouquet" flags="m" />
+		<key id="KEY_TEXT" mapto="text" flags="m" />
+		<key id="KEY_MENU" mapto="menu" flags="m" />
+		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_HOME" mapto="cancel" flags="m" />
+		<key id="KEY_HELP" mapto="cancel" flags="m" />
+		<key id="\x1b" mapto="cancel" flags="m" />
+	</map>
+</keymap>
