Index: /ipk/source/system_addonmanager_2_0/CONTROL/control =================================================================== --- /ipk/source/system_addonmanager_2_0/CONTROL/control (revision 3766) +++ /ipk/source/system_addonmanager_2_0/CONTROL/control (revision 3767) @@ -1,4 +1,4 @@ Package: enigma2-plugin-system-addonmanager -Version: 2.07 +Version: 2.08 Architecture: sh4 OE: This is the AAF- AddonManager. Maybe you know the plugin from BA / FullUSB images! @@ -7,4 +7,4 @@ Maintainer: AAF Homepage: http://www.aaf-digital.info -Description: AddonManager v2.06 +Description: AddonManager v2.08 Source: http://www.aaf-digital.info Index: /ipk/source/system_addonmanager_2_0/CONTROL/preinst =================================================================== --- /ipk/source/system_addonmanager_2_0/CONTROL/preinst (revision 3766) +++ /ipk/source/system_addonmanager_2_0/CONTROL/preinst (revision 3767) @@ -21,5 +21,5 @@ SPACE=`df | grep /dev/mtdblock | grep var | sed 's/ \+/ /g' | cut -d ' ' -f4 | tail -n1` FREE=`expr $SPACE - 100` - SIZE=28 + SIZE=284 echo "checking freespace" echo packege size $SIZE kb Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_script.sh =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_script.sh (revision 3766) +++ (revision ) @@ -1,9 +1,0 @@ -#!/bin/sh - -#read Dirname, the name is in the variable "NewDir" -. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_url - -# here is a Demo for a copyline with the variable NewDir -# cp /etc/tuxbox/satellites.xml /var/baroot/ba/ba/$NewDir/etc/tuxbox/satellites.xml" - - Index: /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/backup.sh =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/backup.sh (revision 3766) +++ /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/backup.sh (revision 3767) @@ -1,16 +1,13 @@ #!/bin/sh -# Backupscript nach Methode niovs -# wird vom Addon-Manager aufgerufen +# *********************************************************** +# Backupscript nach Methode niovs +# wird vom Addon-Manager aufgerufen +# +# kann beliebig für jede Box weitert werden +# +# angepasst fuer Fortis-Boxen by Bauernbub +# *********************************************************** - -DIR="/media/hdd/backup_vu" - -echo -e "***********************************************************" -echo -e "**************Sicherung VU Plus oder Dreambox**************" -echo -e "***********************************************************\n" - -echo -e "\nLege Ordner und die Sicherungsdatei an" -mkdir -p $DIR/ -rm -f $DIR/backup.log ; touch $DIR/backup.log +boxtyp="`cat /proc/stb/info/model`" # all settings are saved, but the restore is defined in the AM-Menu @@ -23,7 +20,28 @@ sonstige=y + +if [ "$boxtyp" == "dm8000" ] + then + DIR="/media/hdd/backup_vu" + echo -e "***********************************************************" + echo -e "**************Sicherung VU Plus oder Dreambox**************" + echo -e "***********************************************************\n" + else + DIR="/media/hdd/backup_fortis" + echo -e "***********************************************************" + echo -e "**************Sicherung Fortis Box gestartet **************" + echo -e "***********************************************************\n" + +fi + +echo -e "\nLege Ordner und die Sicherungsdatei an" + +mkdir -p $DIR/ +rm -f $DIR/backup.log ; touch $DIR/backup.log + #. /var/etc/restore.cfg # read config from Addon-Manager, when you wish only saved defined Settings - -if [ "$settings" = "y" ] +if [ "$boxtyp" == "dm8000" ] + then + if [ "$settings" = "y" ] then tar -cvf $DIR/settings.tar /etc/enigma2/* /etc/tuxbox/* >> $DIR/backup.log @@ -31,7 +49,7 @@ else echo "******** Settings NICHT gesichert ********\n" -fi + fi -if [ "$camconfig" = "y" ] + if [ "$camconfig" = "y" ] then tar -cvf $DIR/camconfig.tar /var/keys/* /usr/scce/* /etc/CC* /usr/scam/* >> $DIR/backup.log @@ -39,7 +57,7 @@ else echo "******** Camconfig NICHT gesichert ********\n" -fi + fi -if [ "$plugins" = "y" ] + if [ "$plugins" = "y" ] then ipkg list_installed |grep enigma2-plugin > /tmp/ipkg.list @@ -48,7 +66,7 @@ else echo -e "******** Plugins NICHT gesichert ********\n" -fi + fi -if [ "$network" = "y" ] + if [ "$network" = "y" ] then tar -cvf $DIR/network.tar /etc/hostname /etc/resolv.conf /etc/wpa_supplicant.conf /etc/network/interfaces >> $DIR/backup.log @@ -56,7 +74,7 @@ else echo -e "******** Netzwerkkonfiguration NICHT gesichert ********\n" -fi + fi -if [ "$samba" = "y" ] + if [ "$samba" = "y" ] then tar -cvf $DIR/samba.tar /etc/samba/smb.conf >> $DIR/backup.log @@ -64,7 +82,7 @@ else echo -e "******** Sambakonfiguration NICHT gesichert ********\n" -fi + fi -if [ "$bilder" = "y" ] + if [ "$bilder" = "y" ] then tar -cvf $DIR/bilder.tar /usr/share/enigma2/*.mvi /usr/share/*.mvi >> $DIR/backup.log @@ -72,7 +90,7 @@ else echo -e "******** Bootbilder und Radiobild NICHT gesichert ********\n" -fi + fi -if [ "$sonstige" = "y" ] + if [ "$sonstige" = "y" ] then if [ -e /etc/inadyn.conf ] @@ -86,4 +104,84 @@ else echo -e "******** sonstige Konfigurationsdateien NICHT gesichert ********\n" + fi +else # Boxtyp is not dm8000 (vubox) + if [ "$settings" = "y" ] + then + tar -cvf $DIR/settings.tar /usr/local/share/enigma2/* /var/etc/enigma2/* /etc/tuxbox/* /var/etc/blueKey >> $DIR/backup.log + echo -e "******** Settings gesichert ********\n" + else + echo "******** Settings NICHT gesichert ********\n" + fi + + if [ "$camconfig" = "y" ] + then + tar -cvf $DIR/camconfig.tar /var/emu/* /var/keys/* /var/etc/*emu /var/etc/active_cam >> $DIR/backup.log + echo -e "******** Camconfig gesichert ********\n" + else + echo "******** Camconfig NICHT gesichert ********\n" + fi + + if [ "$plugins" = "y" ] + then + ipkg list_installed |grep enigma2-plugin > /tmp/ipkg.list + cut -f 1 -d " " /tmp/ipkg.list > $DIR/ipkg.list + + # welche Plugins wurden zusaetzlich installiert? + cd /usr/lib/enigma2/python/Plugins/Extensions + + # welche sind jetzt installiert? + ls -A1 >/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/curlist + cd /usr/lib/enigma2/python/Plugins/Extensions/AddonManager + + # vergleiche Standartplugins mit installierten + diff dirlist curlist >difflist + grep "^+[^+_]" difflist | sed ' s/+//g' >difflist2 + + list="/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/difflist2" + dir2="/usr/lib/enigma2/python/Plugins/Extensions/" + + string="$DIR/plugins.tar" + for i in $(cat $list); do + string=$string" "$dir2$i + done + tar -cvf $string >> $DIR/backup.log + tar -cvf $string /var/etc/uninst/* >> $DIR/backup.log + + rm /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/difflist* + rm /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/curlist + echo -e "******** Plugins gesichert ********\n" + else + echo -e "******** Plugins NICHT gesichert ********\n" + fi + + if [ "$network" = "y" ] + then + tar -cvf $DIR/network.tar /var/etc/automount/* /var/etc/hostname /var/etc/hosts /var/etc/resolv.conf /var/etc/default_gw /var/etc/wpa_supplicant.conf /var/etc/network/interfaces >> $DIR/backup.log + echo -e "******** Netzwerkkonfiguration gesichert ********\n" + else + echo -e "******** Netzwerkkonfiguration NICHT gesichert ********\n" + fi + + if [ "$samba" = "y" ] + then + tar -cvf $DIR/samba.tar /var/etc/smb.conf >> $DIR/backup.log + echo -e "******** Sambakonfiguration gesichert ********\n" + else + echo -e "******** Sambakonfiguration NICHT gesichert ********\n" + fi + + if [ "$sonstige" = "y" ] + then + if [ -e /var/etc/inadyn.conf ] + then + tar -cvf $DIR/sonstige.tar /var/etc/fstab /var/etc/localtime /var/etc/inadyn.conf /var/etc/videomode /var/etc/ntpserver /var/etc/passwd>> $DIR/backup.log + echo -e "******** sonstige Konfigurationsdateien gesichert inkl. DynDNS-Config ********\n" + else + tar -cvf $DIR/sonstige.tar /var/etc/fstab /var/etc/localtime /var/etc/videomode /var/etc/ntpserver /var/etc/passwd>> $DIR/backup. + echo -e "******** sonstige Konfigurationsdateien gesichert ********\n" + fi + else + echo -e "******** sonstige Konfigurationsdateien NICHT gesichert ********\n" + fi fi Index: /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/dirlist =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/dirlist (revision 3767) +++ /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/dirlist (revision 3767) @@ -0,0 +1,16 @@ +Aafpanel +BoardViewer +DVDPlayer +GraphMultiEPG +IMDb +MediaCenter +OSDAdjustment +PlugLoad +SimpleBitrate +SocketMMI +SplitScreen +VFD_Brightness +VirtualZap +Volume_adjust +WebInterface + 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 3766) +++ (revision ) @@ -1,53 +1,0 @@ -#!/bin/sh - - 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 - - LIST=`ls -1 /var/swap/bin` - for ROUND in $LIST; do - if [ ! -e /var/bin/"$ROUND" ]; then - ln -s /var/swap/bin/"$ROUND" /var/bin/"$ROUND" - fi - done - - LIST=`ls -1 /var/swap/fonts` - for ROUND in $LIST; do - if [ ! -e /var/usr/share/fonts/"$ROUND" ]; then - ln -s /var/swap/fonts/"$ROUND" /var/usr/share/fonts/"$ROUND" - fi - done - - LIST=`ls -1 /var/swap/modules` - for ROUND in $LIST; do - if [ ! -e /var/lib/modules/"$ROUND" ]; then - ln -s /var/swap/modules/"$ROUND" /var/lib/modules/"$ROUND" - fi - done - - if [ ! -e /var/usr/local/share/enigma2/picon ]; then - if [ ! $debug == 'off' ]; then - echo "create symlink picon to swapstick" - fi - ln -s /var/swap/picon /var/usr/local/share/enigma2/picon - fi - - LIST=`ls -1 /var/swap/keys` - for ROUND in $LIST; do - if [ ! -e /var/keys/"$ROUND" ]; then - cp /var/swap/keys/"$ROUND" /var/keys/"$ROUND" - fi - done - - LIST=`ls -1 /var/swap/lib` - for ROUND in $LIST; do - if [ ! -e /var/usr/lib/"$ROUND" ]; then - ln -s /var/swap/lib/"$ROUND" /var/usr/lib/"$ROUND" - fi - done - -exit - Index: /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py (revision 3766) +++ /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py (revision 3767) @@ -70,9 +70,4 @@ config.AddonManager.ungenau = ConfigInteger(0, limits=(0, 1)) config.AddonManager.Schriftart = ConfigInteger(14, limits=(10, 22)) -config.AddonManager.ba_settings_on = ConfigInteger(1, limits=(0, 1)) -config.AddonManager.ba_plugins_on = ConfigInteger(0, limits=(0, 1)) -config.AddonManager.ba_skins_on = ConfigInteger(0, limits=(0, 1)) -config.AddonManager.ba_remove_on = ConfigInteger(0, limits=(0, 1)) -config.AddonManager.ba_usersettings_on = ConfigInteger(0, limits=(0, 1)) config.AddonManager2 = ConfigSubsection() @@ -473,5 +468,4 @@ "2": self.bootbilder_download, "3": self.radiobilder_download, - "4": self.image_download, "5": self.settings_backup, "6": self.settings_restore, @@ -555,9 +549,5 @@ if os.path.exists("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ufs922") is False: - if self.BAtyp == "new": - self["key_4"].text = (_("(4) Multip-Image")) - else: - #self["key_4"].text = (_("(4) BAold-Image")) - if box <> "dm8000": + if box <> "dm8000": self["key_4"].text = (_("(5,6) Back/Rest")) @@ -752,6 +742,4 @@ if self.plug == "ipk": fileresultmask = re.compile("(?P.*?)\#\#(?P.*?_sh4.ipk)", re.DOTALL) - elif self.plug == "ipkimage": - fileresultmask = re.compile("(?P.*?)\#\#(?P.*?.img)", re.DOTALL) elif box == "dm8000": fileresultmask = re.compile("(?P.*?)\#\#(?P.*?.ipk)", re.DOTALL) @@ -770,15 +758,4 @@ inhalt = inhalt.lower() inhalt = inhalt.replace("\r\n","") - - if self.plug == "ipkimage" or self.plug == "usbimage": - fd=open("/etc/version") - inhalt=fd.read() # Lese die Version des aktuellen Flashimage - fd.close() - inhalt = inhalt.lower() - inhalt = inhalt.replace("\r\n","") - inhalt = inhalt.replace("aaf_m","") - inhalt = inhalt.split("_")[0] - print inhalt - searchresults = fileresultmask.finditer(feedhtml) @@ -809,9 +786,4 @@ font_s = 0 - if self.plug == "ipkimage" or self.plug == "usbimage": - name_lo = name_lo.split("_")[0] - name_lo = name_lo.replace("m","") - #print name_lo, str(inhalt.find(name_lo)) - if self.marker_on == True: if inhalt.find(name_lo) > -1: @@ -1087,14 +1059,4 @@ self.feed_download() - def image_download(self): - if self.BAtyp == "new": - if os.path.exists("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ufs922") is False: - self.plug = "image" - if box <> "dm8000": - evfd.getInstance().vfd_write_string("BA-Image") - self.feed_base = serverurl + "%s/" % self.plug - self.plugin_filter = "" - self.feed_download() - def settings_backup(self): self["statusbar"].text = _("Backup der Einstellungen ist gestartet ....") @@ -1114,26 +1076,4 @@ #----- plugin download ------------------------------------------------------------ def check_download(self): - if self.plug == "usbimage": - if self["feedlist"].isValid(): - url = self["feedlist"].getPLUGINurl() - print url - self.foundipk = re.search('sh4', str(url)) - self.urlname = url - - if os.path.exists("/var/swap/images") is False: - os.system("mkdir -p /var/swap/images") - - self.flashname = self.urlname.replace(self.feed_base,"") - print "[Addon-Manager] Flashname: ", self.flashname - self.PLUGINlocal = "/var/swap/images/" + str(self.flashname) - if box <> "dm8000": - evfd.getInstance().vfd_write_string("load USBImage") - - os.system("rm /tmp/nochmals") - if os.path.exists(self.PLUGINlocal) is True: - self.session.openWithCallback(self.startNochmals, MessageBox, (_("TAR-File ist bereits geladen\nnochmals downloaden?")), MessageBox.TYPE_YESNO) - else: - self.plugin_download() - else: self.plugin_download() @@ -1162,63 +1102,4 @@ self.PluginPath = "E2/image" - if self.plug == "beta": - patternprog = re.compile(".img.tar.gz") - a_match = patternprog.search(str(url)) - if ( a_match ): - self.plug = "image" - self.PluginPath = "E2/beta" - - if self.plug == "image": - if self.BAtyp == "new": - # is enough freespace on stick? - os.system("df /var/baroot |grep rootfs|cut -c41-50 >/tmp/free.txt") - if os.path.exists("/tmp/free.txt") is True: - f = open("/tmp/free.txt", "r" ) - for line in f: - freesize = line.lstrip() - f.close - freesize = freesize.replace("\n","") - freesize = int(freesize) - - if 84000 > freesize: - print "[Addon-Manager] nicht OK" - message = "%s" % (_("Zu wenig Speicher im Stick frei!")) - self.session.open(MessageBox, message, MessageBox.TYPE_ERROR) - self.error_counter = "1" - else: - print "[Addon-Manager] OK" + str(freesize) - if os.path.exists("/var/baroot/ba/ba.sh") is False: - if os.path.exists("/var/baroot") is False: - os.system("mkdir /var/baroot") - - # search XBA Stick in bootp.conf - os.system("cat /bootp.conf | grep BADEVICE= >/tmp/dev.txt") - if os.path.exists("/tmp/dev.txt") is True: - f = open("/tmp/dev.txt", "r" ) - for line in f: - dev = line.replace(u"BADEVICE=","") - dev = dev.replace(u"\n","") - f.close - - # mount the BA envirmonment - #os.system("mount /dev/sda1 /var/baroot") - TarString="mount " + dev + " /var/baroot" - os.system(TarString) - - imgname = url.replace(u".img.tar.gz","") - findimg = imgname.rfind(self.PluginPath) - if self.PluginPath == "E2/beta": - self.urlname = imgname[findimg+8:len(imgname)] - if self.PluginPath == "E2/image": - self.urlname = imgname[findimg+9:len(imgname)] - - self.PLUGINlocal = '/var/baroot/UFS_Images/%s' % self.urlname - if box <> "dm8000": - evfd.getInstance().vfd_write_string("load Image") - - pngpath = "/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/install.png" - self.previewPath = pngpath - self["Preview"].show() - self["Preview"].instance.setPixmapFromFile(self.previewPath) if self.error_counter == "0": @@ -1264,216 +1145,5 @@ ffile.close() - # is it an multiboot environment? - if self.plug == "image": - if os.path.exists("/bootp.conf") is True: - if self.BAtyp == "new": - if box <> "dm8000": - evfd.getInstance().vfd_write_string("install Image") - self["statusbar"].text = _("Decompressing Image in progress...") - self.urlnameorg = self.urlname - self.urlname = self.urlname.replace(".tar.gz","") - self.urlname_org = self.urlname - # check if exist Image, then make a newer - TargetDir = "/var/baroot/ba/ba/" + self.urlname - if os.path.exists(TargetDir) is True: - self.urlname = self.urlname_org + "_2" - TargetDir = "/var/baroot/ba/ba/" + self.urlname - if os.path.exists(TargetDir) is True: - self.urlname = self.urlname_org + "_3" - TargetDir = "/var/baroot/ba/ba/" + self.urlname - if os.path.exists(TargetDir) is True: - self.urlname = self.urlname_org + "_4" - TargetDir = "/var/baroot/ba/ba/" + self.urlname - if os.path.exists(TargetDir) is True: - self.urlname = self.urlname_org + "_5" - if os.path.exists(TargetDir) is True: - self.urlname = self.urlname_org + "_6" - TargetDir = "/var/baroot/ba/ba/" + self.urlname - if os.path.exists(TargetDir) is True: - self.urlname = self.urlname_org + "_7" - if os.path.exists(TargetDir) is True: - self.urlname = self.urlname_org + "_8" - if os.path.exists(TargetDir) is True: - self.urlname = self.urlname_org + "_9" - TargetDir = "/var/baroot/ba/ba/" + self.urlname - if os.path.exists(TargetDir) is True: - self.urlname = self.urlname_org + "_10" - - TargetDir = "mkdir -p /var/baroot/ba/ba/" + self.urlname - os.system(TargetDir) - - # write name to userfile - TargetDir = "NewDir=" + self.urlname - ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_url", "w") - ffile.write(TargetDir) - ffile.close() - - TarString = "cd /var/baroot/UFS_Images; tar -xzf " + self.urlnameorg + " -C /var/baroot/ba/ba/" + self.urlname - os.system(TarString) - CpString = "cp /bootp.conf /var/baroot/ba/ba/" + self.urlname - os.system(CpString) - if os.path.exists("/bootp2.conf") is True: - CpString = "cp /bootp2.conf /var/baroot/ba/ba/" + self.urlname - os.system(CpString) - - #CpString = "cp /etc/init.d/rcS /var/baroot/ba/ba/" + self.urlname + "/etc/init.d/rcS" - #os.system(CpString) - - RCS = "/var/baroot/ba/ba/" + self.urlname + "/etc/init.d/rcS" - #CpString = "cat /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/rcs_header > /tmp/rcs.txt" - #os.system(CpString) - - CpString = "sed -e 's*#!/bin/sh*#*g' -i " + RCS - os.system(CpString) - - ffile = open("/tmp/rcs.txt", "w") - CpString = "#!/bin/sh" - ffile.write(CpString) - ffile.write("\n") - CpString = "" - ffile.write(CpString) - ffile.write("\n") - CpString = "if [ -e /activImage ]; then" - ffile.write(CpString) - ffile.write("\n") - CpString = " echo \"Starte chroot\"" - ffile.write(CpString) - ffile.write("\n") - CpString = " mount -o bind /baroot /activImage/var/baroot" - ffile.write(CpString) - ffile.write("\n") - CpString = " exec chroot /activImage /etc/init.d/rcS" - ffile.write(CpString) - ffile.write("\n") - CpString = "fi" - ffile.write(CpString) - ffile.write("\n") - CpString = "" - ffile.write(CpString) - ffile.write("\n") - ffile.close() - - CpString = "cat " + RCS + " >> /tmp/rcs.txt" - os.system(CpString) - CpString = "cp /tmp/rcs.txt " + RCS - os.system(CpString) - CpString = "chmode 755 " + RCS - os.system(CpString) - CpString = "sed -e 's/fsck /#fsck /g' -i /var/baroot/ba/ba/" + self.urlname + "/etc/init.d/mountvirtfs" - os.system(CpString) - CpString = "mkdir -p /var/baroot/ba/ba/" + self.urlname + "/var/baroot" - os.system(CpString) - os.system("sync") - - # set automount in rcs - os.system("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/makercs.sh") - - # and now we copy the settings - if config.AddonManager.ba_settings_on.value == 1: - if box <> "dm8000": - evfd.getInstance().vfd_write_string("install Settings") - self["statusbar"].text = _("Settings werden uebernommen....") - - CpString = "rm /var/baroot/ba/ba/" + self.urlname + "/var/etc/.firstboot" - os.system(CpString) - CpString = "cp -RP /var/emu /var/baroot/ba/ba/" + self.urlname + "/var/" - os.system(CpString) - CpString = "cp -RP /var/keys /var/baroot/ba/ba/" + self.urlname + "/var/" - os.system(CpString) - CpString = "cp /var/etc/active_cam /var/baroot/ba/ba/" + self.urlname + "/var/etc/active_cam" - os.system(CpString) - CpString = "cp /var/etc/*emu /var/baroot/ba/ba/" + self.urlname + "/var/etc/" - os.system(CpString) - CpString = "cp /var/etc/smbfs /var/baroot/ba/ba/" + self.urlname + "/var/etc/" - os.system(CpString) - CpString = "cp /var/etc/upnpfs /var/baroot/ba/ba/" + self.urlname + "/var/etc/" - os.system(CpString) - - CpString = "cp /var/*emu /var/baroot/ba/ba/" + self.urlname + "/var/" - os.system(CpString) - CpString = "cp /usr/local/share/enigma2/lamedb /var/baroot/ba/ba/" + self.urlname + "/usr/local/share/enigma2/" - os.system(CpString) - CpString = "cp /usr/local/share/enigma2/bouquets* /var/baroot/ba/ba/" + self.urlname + "/usr/local/share/enigma2/" - os.system(CpString) - CpString = "cp /usr/local/share/enigma2/userbouquet* /var/baroot/ba/ba/" + self.urlname + "/usr/local/share/enigma2/" - os.system(CpString) - CpString = "cp /etc/tuxbox/satellites.xml /var/baroot/ba/ba/" + self.urlname + "/etc/tuxbox/satellites.xml" - os.system(CpString) - #CpString = "cp /usr/local/share/enigma2/settings /var/baroot/ba/ba/" + self.urlname + "/usr/local/share/enigma2/" - #os.system(CpString) - CpString = "cp /usr/automount/amount.ini /var/baroot/ba/ba/" + self.urlname + "/usr/automount/amount.ini" - os.system(CpString) - CpString = "cp /usr/share/fonts/*.ttf /var/baroot/ba/ba/" + self.urlname + "/usr/share/fonts/" - os.system(CpString) - CpString = "cp /etc/auto.misc /var/baroot/ba/ba/" + self.urlname + "/etc/" - os.system(CpString) - - - #// Check for default skin - defaultSkin = 0 - PathString = "/var/baroot/ba/ba/" + self.urlname + "/var/usr/local/share/enigma2/settings" - if os.path.exists(PathString) is True: - em = open(PathString) - e = em.readlines() - em.close() - for line in e: - if line.find("config.skin.primary_skin") > -1: - defaultSkin = 1 - PrimarySkin = line - - CpString = "cp /usr/local/share/enigma2/settings /var/baroot/ba/ba/" + self.urlname + "/usr/local/share/enigma2/" - os.system(CpString) - - if defaultSkin == 1: - em = open(PathString, "a") - em.write(PrimarySkin) - em.close() - - if config.AddonManager.ba_skins_on.value == 1: - CpString = "cp -RP /usr/local/share/enigma2/ /var/baroot/ba/ba/" + self.urlname + "/usr/local/share/" - os.system(CpString) - - CpString = "cp -RP /usr/lib/enigma2/python/Plugins/Extensions/InfoBarConfig/ /var/baroot/ba/ba/" + self.urlname + "/usr/lib/enigma2/python/Plugins/Extensions/" - os.system(CpString) - - CpString = "cp /usr/lib/enigma2/python/Components/Converter/MaxCryptoInfo.pyc /var/baroot/ba/ba/" + self.urlname + "/usr/lib/enigma2/python/Components/Converter/" - os.system(CpString) - - CpString = "cp /usr/lib/enigma2/python/Components/Converter/MaxServiceInfo.pyc /var/baroot/ba/ba/" + self.urlname + "/usr/lib/enigma2/python/Components/Converter/" - os.system(CpString) - - if config.AddonManager.ba_plugins_on.value == 1: - # save AddonManager + Aafpanel, because in new image is newer - os.system("cp -RP /usr/lib/enigma2/python/Plugins/Extensions/AddonManager /tmp/") - os.system("cp -RP /usr/lib/enigma2/python/Plugins/Extensions/Aafpanel /tmp/") - CpString = "cp -RP /usr/lib/enigma2/python/Plugins/Extensions /var/baroot/ba/ba/" + self.urlname + "/usr/lib/enigma2/python/Plugins/" - os.system(CpString) - # restore AddonManager + Aafpanel - CpString = "cp -RP /tmp/AddonManager /var/baroot/ba/ba/" + self.urlname + "/usr/lib/enigma2/python/Plugins/" - os.system(CpString) - CpString = "cp -RP /tmp/Aafpanel /var/baroot/ba/ba/" + self.urlname + "/usr/lib/enigma2/python/Plugins/" - os.system(CpString) - - if config.AddonManager.ba_remove_on.value == 1: - CpString = "rm -r /var/baroot/UFS_Images/" + self.urlnameorg - os.system(CpString) - - if config.AddonManager.ba_usersettings_on.value == 1: - if os.path.exists("/var/baroot/default_settings") is True: - CpString = "cp /var/baroot/default_settings /var/baroot/ba/ba/" + self.urlname + "/usr/local/share/enigma2/settings" - os.system(CpString) - - if os.path.exists("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_script.sh") is True: - CpString = "cp /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_script.sh /var/baroot/ba/ba/" + self.urlname + "/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_script.sh" - os.system(CpString) - os.system("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_script.sh") - - if box <> "dm8000": - evfd.getInstance().vfd_write_string("Image Ready!") - restartbox = self.session.openWithCallback(self.restart,MessageBox,_("Das Image ist nun fertig installiert!\nSoll ein Neustart durchgefuehrt werden?"), MessageBox.TYPE_YESNO) - restartbox.setTitle(_("UFS-Box starten?")) - else: - # no image and an ipk-file - if len(str(self.foundipk)) == 4: + if len(str(self.foundipk)) == 4: ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") ffile.write("es ist ein Tarfile ") @@ -1745,5 +1415,5 @@ os.system("rm -r /tmp/aaf") os.system("cd / ; rm *tar.gz") - else: + else: ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") ffile.write("IPK wird entpackt!") @@ -1768,26 +1438,4 @@ def restart(self, answer): if answer is True: - # make bootimage active for restart - if self.BAtyp == "new": - ffile = open("/var/baroot/ba/.baboot", "w") - ffile.write(self.urlname) - ffile.write("\n") - ffile.close() - else: - ffile = open("/ba/.baboot", "w") - ffile.write(self.urlname_org) - ffile.write("\n") - ffile.close() - # and now we write the devicename - fileread = open("/ba/ba/" + self.urlname_org + "/bootp.conf", "r" ) - for line in fileread: - if line.split('=')[0] == "BADEVICE": - self.device = line.split('=')[1] - ffile = open("/ba/.badevice", "w") - ffile.write(self.device) - #ffile.write("\n") - ffile.close() - fileread.close() - os.system("sync") os.system("reboot -f") @@ -1870,9 +1518,4 @@ self.list.append(getConfigListEntry(_("Markierungsfarbe (0=rot, 1=gruen, 2=blau)"), config.AddonManager.mark_color)) self.list.append(getConfigListEntry(_("Installierte Plugins feststellen (0=genau, 1=ungenau)"), config.AddonManager.ungenau)) - self.list.append(getConfigListEntry(_("BA Installation Settingsuebernahme (1=Ein, 0=Aus)"), config.AddonManager.ba_settings_on)) - self.list.append(getConfigListEntry(_("BA Installation Pluginsuebernahme (1=Ein, 0=Aus)"), config.AddonManager.ba_plugins_on)) - self.list.append(getConfigListEntry(_("BA Installation Skinsuebernahme (1=Ein, 0=Aus)"), config.AddonManager.ba_skins_on)) - self.list.append(getConfigListEntry(_("BA temp.Image nach Download entfernen (1=Ein, 0=Aus)"), config.AddonManager.ba_remove_on)) - self.list.append(getConfigListEntry(_("BA Defaultsettings kopieren (1=Ein, 0=Aus)"), config.AddonManager.ba_usersettings_on)) self.list.append(getConfigListEntry(_("Restore Settings (1=Ein, 0=Aus)"), config.AddonManager2.sett_on)) self.list.append(getConfigListEntry(_("Restore CamConfig (1=Ein, 0=Aus)"), config.AddonManager2.camconfig_on)) @@ -1922,70 +1565,4 @@ self.close(False) -class RestoreConfigScreen(ConfigListScreen,Screen): - skin = """ - - - - - """ - - def __init__(self, session, args = 0): - self.session = session - #switch automatic to current skin - current_w = getDesktop(0).size().width() - current_h = getDesktop(0).size().height() - print "[Addon-Manager] DESKTOPsize is",current_w,current_h - size_w = 650 - size_h = 400 - - # calculate Skin koordinates - pos_w = (current_w - size_w)/2 - pos_h = (current_h - size_h)/2 - - # set Skinvariables - self.dict = { - 'screen.size': "%i,%i"%(size_w,size_h), - 'screen.pos': "%i,%i"%(pos_w,pos_h), - } - - self.skin = applySkinVars(RestoreConfigScreen.skin,self.dict) - Screen.__init__(self, session) - self.list = [] - self.list.append(getConfigListEntry(_("Restore Settings (1=Ein, 0=Aus)"), config.AddonManager2.sett_on)) - self.list.append(getConfigListEntry(_("Restore CamConfig (1=Ein, 0=Aus)"), config.AddonManager2.camconfig_on)) - self.list.append(getConfigListEntry(_("Restore Plugins(1=Ein, 0=Aus)"), config.AddonManager2.plug_on)) - self.list.append(getConfigListEntry(_("Restore Netzwerk (1=Ein, 0=Aus)"), config.AddonManager2.network_on)) - self.list.append(getConfigListEntry(_("Restore Samba (1=Ein, 0=Aus)"), config.AddonManager2.samba_on)) - self.list.append(getConfigListEntry(_("Restore Bootbilder (1=Ein, 0=Aus)"), config.AddonManager2.bilder_on)) - self.list.append(getConfigListEntry(_("Restore sonstiges (1=Ein, 0=Aus)"), config.AddonManager2.sonstige_on)) - - ConfigListScreen.__init__(self, self.list) - self["buttonred"] = Label(_("cancel")) - self["buttongreen"] = Label(_("ok")) - self["setupActions"] = ActionMap(["SetupActions"], - { - "green": self.save, - "red": self.cancel, - "save": self.save, - "cancel": self.cancel, - "ok": self.save, - }, -2) - - def save(self): - global activesource, activenam - for x in self["config"].list: - x[1].save() - config.save() - - restore() - self.close() - - def cancel(self): - print "[Addon-Manager] cancel" - for x in self["config"].list: - x[1].cancel() - self.close(False) - - #----------------------------------------------------------------- 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 3766) +++ (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 /tmp/aaf/first.txt - -check=`cat /tmp/aaf/test | grep _3p1stbl_ | cut -d '"' -f2 | sed '/.kim/d' | sed '/.md5/d' | tail -n1` - -if [ "$check" == "top" ]; then - FILELIST=`cat /tmp/aaf/test | grep _3p1stbl_ | cut -d '"' -f8 | sed '/.kim/d' | sed '/.md5/d' | sed '/.gz/` -else - FILELIST=`cat /tmp/aaf/test | grep _3p1stbl_ | cut -d '"' -f2 | sed '/.kim/d' | sed '/.md5/d' | sed '/.gz/d'` -fi - -for i in $FILELIST; do - Titel="`echo $i | sed -e 's/AAF_//'| sed -e 's/_e2.img//'| sed -e 's/_obi_3p1stbl//'`" - echo $Titel"##"$i >>/tmp/aaf/index.txt -done - -#cat /tmp/aaf/index.txt Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/install.sh =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/install.sh (revision 3766) +++ (revision ) @@ -1,117 +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 - mkdir -p /tmp/aaf -} - -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 -echo $SOURCE >/var/etc/.quellen_active.cfg -} - -install_addon /tmp/aaf/downfile.tar.gz - Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/makercs.sh =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/makercs.sh (revision 3766) +++ (revision ) @@ -1,27 +1,0 @@ -#!/bin/sh - -# benoetigt Addon-Manager um die rcs anzupassen -# die baroot wird gemountet - -# read Imagename in NewDir -. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_url - -TMP="/tmp/rcs.tmp" -# RCS="/etc/init.d/rcS" -RCS="/var/baroot/ba/ba/$NewDir/etc/init.d/rcS" - -if [ `grep "mount BAROOT" "$RCS" | wc -l` -eq 0 ]; then - if [ `grep "/etc/init.d/mountvirtfs" "$RCS" | wc -l` -gt 0 ]; then - grep -n "/etc/init.d/mountvirtfs" "$RCS" > $TMP - PL=`cut -d: -f1 $TMP` - sed -e $PL'a\done' "$RCS" | - sed -e $PL'a\ fi' | - sed -e $PL'a\ break' | - sed -e $PL'a\ mount /dev/\$device /var/baroot' | - sed -e $PL'a\ if [ \`tune2fs -l /dev/\$device | grep XBA | wc -l\` -gt 0 ]; then' | - sed -e $PL'a\for device in sda1 sda2 sda3 sda4 sdb1 sdb2 sdb3 sdb4 sdc1 sdc2 sdc3 sdc4; do' | - sed -e $PL'a\#mount BAROOT' > $TMP - cp $TMP "$RCS" - fi -fi -sync Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/mountbaroot.sh =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/mountbaroot.sh (revision 3766) +++ (revision ) @@ -1,10 +1,0 @@ -#!/bin/sh -#!/bin/sh - -for device in sda1 sda2 sda3 sda4 sdb1 sdb2 sdb3 sdb4 sdc1 sdc2 sdc3 sdc4; do - if [ `tune2fs -l /dev/$device | grep XBA | wc -l` -gt 0 ]; then - echo $device - mount /dev/$device /var/baroot - break - fi -done Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/mounten.sh =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/mounten.sh (revision 3766) +++ (revision ) @@ -1,12 +1,0 @@ -#!/bin/sh - -trymount(){ - mount -t vfat -o "$RW",umask=000,shortname=winnt,noatime "$1" "$2" || \ - mount -t iso9660 -o ro "$1" "$2" || \ - ntfs-3g -o "$RW",umask=000,force "$1" "$2" || \ - mount -t reiserfs -o "$RW",noatime "$1" "$2" || \ - mount -t ext3 -o "$RW",noatime "$1" "$2" || \ - mount -t ext2 -o "$RW",noatime "$1" "$2" - return "$?" -} - Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/rcs_header =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/rcs_header (revision 3766) +++ (revision ) @@ -1,7 +1,0 @@ -#!/bin/sh - -if [ -e /activImage ]; then - echo "Starte chroot" - mount -o bind /baroot /activImage/var/baroot - exec chroot /activImage /etc/init.d/rcS -fi Index: /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/restore.sh =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/restore.sh (revision 3766) +++ /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/restore.sh (revision 3767) @@ -1,9 +1,14 @@ #!/bin/sh -# Restorescript nach Methode niovs -# wird vom Addon-Manager aufgerufen +# *********************************************************** +# Backupscript nach Methode niovs +# wird vom Addon-Manager aufgerufen +# +# kann beliebig für jede Box weitert werden +# +# angepasst fuer Fortis-Boxen by Bauernbub +# *********************************************************** + . /var/etc/restore.cfg # read config from Addon-Manager - -DIR="/media/hdd/backup_vu" echo -e "***********************************************************" @@ -11,4 +16,11 @@ echo -e "***********************************************************\n" +boxtyp="`cat /proc/stb/info/model`" +if [ "$boxtyp" == "dm8000" ] + then + DIR="/media/hdd/backup_vu" + else + DIR="/media/hdd/backup_fortis" +fi rm -f $DIR/restore.log ; touch $DIR/restore.log @@ -21,11 +33,18 @@ for i in `cat $DIR/ipkg.list ` ; do ipkg install $i ; done echo -e "******** Plugins wiederhergestellt ********\n" - elif [ -e $DIR/ipkg.list ] - then - ipkg update - for i in `cat $DIR/ipkg.list ` ; do ipkg install $i ; done - echo -e "******** Plugins wiederhergestellt ********\n" - else - echo -e "******** Kein Backup der Plugins vorhanden! ********\n" + elif [ -e $DIR/ipkg.list ] + then + ipkg update + for i in `cat $DIR/ipkg.list ` ; do ipkg install $i ; done + echo -e "******** IPK-Plugins wiederhergestellt ********\n" + else + echo -e "******** Kein Backup der IPK-Plugins vorhanden! ********\n" + fi + if [ -e $DIR/plugins.tar ] + then + tar -xvf $DIR/plugins.tar -C / >> $DIR/restore.log + echo -e "******** Extension/Plugins wiederhergestellt ********\n" + else + echo -e "******** Kein Backup der Plugins vorhanden! ********\n" fi fi Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/st.sh =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/st.sh (revision 3766) +++ (revision ) @@ -1,17 +1,0 @@ -#!/bin/sh - -# benoetigt Addon-Manager um die start.sh anzupassen -# die vom AM benoetigten pics werden nach Aafpanel installiert - -TMP="/tmp/st.tmp" -ST="/mnt/usb/var/etc/autostart/start.sh" - -if [ `grep "/AddonManager/pics" "$ST" | wc -l` -eq 0 ]; then - grep -n "touch /var/etc/.first" "$ST" > $TMP - PL=`cut -d: -f1 $TMP` - sed -e $PL'a\#modifyed bb' "$ST" | - sed -e $PL'a\ cp -r /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/pics /usr/lib/enigma2/python/Plugins/Extensions/Aafpanel/' > $TMP - cp $TMP "$ST" -fi -sync -exit Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/start.sh =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/start.sh (revision 3766) +++ (revision ) @@ -1,908 +1,0 @@ -#!/bin/sh -. /var/etc/autostart/start-config -INPUT=$1 -REBOOT=$2 -CMD="[start.sh]" -if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start -fi -if [ -e /var/etc/autostart/start-config ] && [ $debug = 'full' ]; then - set -x -fi - -startServer() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start ftp and telnet - fi - /usr/sbin/telnetd -l /bin/login - /etc/init.d/vsftpd start -} - -startCompcache() { - if [ "$compcachesize" != 0 ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start Compcache ramswap - fi - /sbin/insmod /lib/modules/lzo1x_compress.ko - /sbin/insmod /lib/modules/lzo1x_decompress.ko - /sbin/insmod /lib/modules/xvmalloc.ko - /sbin/insmod /lib/modules/ramzswap.ko disksize_kb=5000 - mknod /dev/ramzswap0 b 253 0 - swapon /dev/ramzswap0 - fi -} - -startFsckswap() { - setfile=/var/usr/local/share/enigma2/settings - setcat=`cat $setfile | grep config.plugins.automount` - start=`echo -e $setcat | grep config.plugins.automount.start | wc -l` - if [ "$fsckswap" == y ] && [ $start = 0 ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] fsck swapstick - fi - SWAPLABEL=`blkid | grep SWAP | tr " " "\n" | sed 's/://' | grep /dev/` - /sbin/fsck.vfat -y $SWAPLABEL - fi -} - -startFsckrecord() { - setfile=/var/usr/local/share/enigma2/settings - setcat=`cat $setfile | grep config.plugins.automount` - start=`echo -e $setcat | grep config.plugins.automount.start | wc -l` - if [ "$fsckrecord" == y ] && [ $start = 0 ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] fsck swapstick - fi - RECORDLABEL=`blkid | grep RECORD | tr " " "\n" | sed 's/://' | grep /dev/` - /sbin/fsck.vfat -y $RECORDLABEL - fi -} - -startMount() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] mount swap and record - fi - if [ -e /var/swap/swapfile ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] remove SWAP fom Flash - fi - rm -rf /var/swap/swapfile - fi - - setfile=/var/usr/local/share/enigma2/settings - setcat=`cat $setfile | grep config.plugins.automount` - start=`echo -e $setcat | grep config.plugins.automount.start | wc -l` - if [ $start = 0 ]; then - echo automount start - devlist=`cat /proc/diskstats | cut -c 11- | cut -d " " -f1 | grep "sd[a-z][0-9]"` - for device in $devlist; do - label=`blkid -w /dev/null -c /dev/null -s LABEL "/dev/$device" | cut -d '"' -f2` - type=`blkid -w /dev/null -c /dev/null -s TYPE "/dev/$device" | cut -d '"' -f2` - dev=`echo -e $setcat | grep config.plugins.automount.dev | wc -l` - usbdir=`echo -e $setcat | grep config.plugins.automount.usbdir | wc -l` - swapdir=`echo -e $setcat | grep config.plugins.automount.swapdir | wc -l` - recorddir=`echo -e $setcat | grep config.plugins.automount.recorddir | wc -l` - - if [ $label == "SWAP" ]; then - mount -t $type /dev/"$device" /var/swap - mount --bind /var/swap/automount /var/etc/automount - mount --bind /var/swap/mcsaver /usr/lib/enigma2/python/Plugins/Extensions/MediaCenter/saver - mount --bind /var/swap/ba /var/baroot - elif [ $label == "RECORD" ]; then - mount -t $type /dev/"$device" /media/hdd - elif [ $label == "XE2BA" ]; then - mount -t $type /dev/"$device" /var/baroot - else - if [ $dev = 1 ]; then - dev=`echo -e $device` - else - dev=$label - fi - if [ $usbdir = 1 ]; then - usbdir="/media/usb" - else - usbdir="/media/autofs" - fi - if [ ! -e "$usbdir"/"$dev" ]; then - mkdir -p "$usbdir"/"$dev" - fi - mount -t "$type" /dev/"$device" "$usbdir"/"$dev" - fi - done - fi -} - -startPlugload() { - if [ "$plugload" = y ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start Plugload - fi - /var/etc/PlugLoad.sh - fi -} - -startCheckfree() { - if [ -e /sbin/checkfree ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] checkfree - fi - /sbin/checkfree - fi -} - -startLoadmodules() { - if [ `ls -1 | tail -n1 | wc -l` -eq 1 ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] load Module - fi - LIST=`ls -1 /var/lib/modules` - for ROUND in $LIST; do - insmod /var/lib/modules/"$ROUND" - done - fi -} - -startRmemthy() { - if [ -e /media/autofs ] && [ $rmemthy = 'y' ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start rmemthy - fi - LIST=`ls -1 /media/autofs` - for ROUND in $LIST; do - LENG=`ls -al /media/autofs/"$ROUND" | wc -l` - if [ $LENG = "2" ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] remove empty folder $LIST / $ROUND - fi - rm -rf /media/autofs/"$ROUND" - fi - done - - LIST=`ls -1 /media/usb` - for ROUND in $LIST; do - LENG=`ls -al /media/usb/"$ROUND" | wc -l` - if [ $LENG = "2" ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] remove empty folder $LIST / $ROUND - fi - rm -rf /media/usb/"$ROUND" - fi - done - - LENG=`ls -al /media/usb | wc -l` - if [ $LENG = "2" ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] remove empty folder /media/usb - fi - rm -rf /media/usb - fi - LENG=`ls -al /media/autofs | wc -l` - if [ $LENG = "2" ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] remove empty folder /media/autofs - fi - rm -rf /media/autofs - fi - - fi -} - -startAutodns() { - if [ `which autodns | wc -l` -eq 1 ] && [ $autodns = 'y' ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start autodns - fi - autodns & - fi -} - -startRmplaylist() { - if [ -e /var/usr/local/share/enigma2/playlist.e2pls ] && [ $playlist = 'y' ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start remove playlist - fi - rm /var/usr/local/share/enigma2/playlist.e2pls - fi -} - -startPortmap() { - if [ `which portmap | wc -l` -eq 1 ] && [ -e /etc/init.d/portmap ] && [ $portmap = 'y' ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start portmap - fi - /etc/init.d/portmap start - fi -} - -startBootstop() { - if [ `fdisk -l | tail -n1 | wc -l` -eq 1 ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start sleep $bootstop s - fi - sleep $bootstop - fi -} - -startSamba() { - IP="`ifconfig | grep inet | grep Bcast | cut -d : -f 2 | sed 's/ Bcast//' | sed 's/ //'`" - KIP=`cat /var/etc/smb.conf | grep interfaces | sed 's/interfaces = //' | cut -d "/" -f1` - if [ ! $KIP = $IP ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] set $KIP -> $IP in smb.conf - fi - sed -e "s/$KIP/$IP/g" -i /var/etc/smb.conf - fi - - KIP=`cat /.smb/smb.conf | grep interfaces | sed 's/interfaces = //' | cut -d "/" -f1` - if [ ! $KIP = $IP ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] set $KIP -> $IP in smb.conf - fi - sed -e "s/$KIP/$IP/g" -i /var/root/.smb/smb.conf - fi - - if [ -e /var/bin/smbd ] && [ -e /var/bin/nmbd ] && [ $sambaserver = 'y' ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start samba - fi - HOSTN=`hostname` - if [ `cat /etc/hosts | grep $HOSTN | wc -l` -eq 0 ]; then - echo $IP $HOSTN >> /etc/hosts - fi - /var/bin/smbd -D - sleep 1 - /var/bin/nmbd -D - fi -} - -startStickextensions() { - if [ `which swap | wc -l` -eq 1 ] && [ `mount | grep /var/swap | wc -l` -eq 1 ]; then - if [ $swap = 'y' ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start swap - fi - swapoff /dev/ramzswap0 - rmmod /lib/modules/ramzswap.ko - swap - - fi - if [ ! -e /var/swap/automount ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create automount DIR - fi - mkdir /var/swap/automount - fi - - if [ ! -e /var/swap/automount/automounts.xml ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] copy automounts.xml to swap - fi - cp /var/etc/automount/automounts.xml /var/swap/automount/automounts.xml - fi - - if [ ! -e /var/swap/skins ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create skins DIR - fi - mkdir /var/swap/skins - fi - - if [ ! -e /var/swap/saver ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create swap DIR - fi - mkdir /var/swap/saver - fi - - if [ ! -e /var/swap/mcskins ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create swap DIR - fi - mkdir /var/swap/mcskins - fi - - if [ ! -e /var/swap/images ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create swap DIR - fi - mkdir /var/swap/images - fi - - if [ ! -e /var/swap/extensions ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create extensions DIR - fi - mkdir /var/swap/extensions - fi - LIST=`ls -1 /var/swap/extensions` - for ROUND in $LIST; do - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create symlink $ROUND to swapstick - fi - 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 - - if [ ! -e /var/swap/bin ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create bin DIR - fi - mkdir /var/swap/bin - fi - LIST=`ls -1 /var/swap/bin` - for ROUND in $LIST; do - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create symlink $ROUND to swapstick - fi - if [ ! -e /var/bin/"$ROUND" ]; then - ln -s /var/swap/bin/"$ROUND" /var/bin/"$ROUND" - fi - done - - if [ ! -e /var/swap/fonts ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create swap DIR - fi - mkdir /var/swap/fonts - fi - LIST=`ls -1 /var/swap/fonts` - for ROUND in $LIST; do - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create symlink $ROUND to swapstick - fi - if [ ! -e /var/usr/share/fonts/"$ROUND" ]; then - ln -s /var/swap/fonts/"$ROUND" /var/usr/share/fonts/"$ROUND" - fi - done - - - if [ ! -e /var/swap/modules ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create modules DIR - fi - mkdir /var/swap/modules - fi - LIST=`ls -1 /var/swap/modules` - for ROUND in $LIST; do - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create symlink $ROUND to swapstick - fi - if [ ! -e /var/lib/modules/"$ROUND" ]; then - ln -s /var/swap/modules/"$ROUND" /var/lib/modules/"$ROUND" - fi - done - - if [ ! -e /var/swap/picon ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create picon DIR - fi - mkdir /var/swap/picon - fi - if [ ! -e /var/usr/local/share/enigma2/picon ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create symlink picon to swapstick - fi - ln -s /var/swap/picon /var/usr/local/share/enigma2/picon - fi - - if [ ! -e /var/swap/keys ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create keys DIR - fi - mkdir /var/swap/keys - fi - LIST=`ls -1 /var/swap/keys` - for ROUND in $LIST; do - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create symlink $ROUND to swapstick - fi - if [ ! -e /var/keys/"$ROUND" ]; then - cp /var/swap/keys/"$ROUND" /var/keys/"$ROUND" - fi - done - if [ ! -e /var/swap/lib ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create lib DIR - fi - mkdir /var/swap/lib - fi - LIST=`ls -1 /var/swap/lib` - for ROUND in $LIST; do - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create symlink $ROUND to swapstick - fi - if [ ! -e /var/usr/lib/"$ROUND" ]; then - ln -s /var/swap/lib/"$ROUND" /var/usr/lib/"$ROUND" - fi - done -# -------- modified bb, restore settings after flashing ------------- - if [ -e /var/swap/enigma2/.firstrun ]; then - LIST=`ls -1 /var/swap/enigma2` - for ROUND in $LIST; do - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create settings $ROUND to swapstick - fi - cp /var/swap/enigma2/"$ROUND" /usr/local/share/enigma2/"$ROUND" - done - if [ -e /var/swap/tuxbox/satellites.xml ]; then - cp /var/swap/tuxbox/satellites.xml /var/etc/tuxbox/ - fi - if [ -e /var/swap/etc ]; then - cp /var/swap/etc/* /var/etc/ - fi - rm /var/swap/enigma2/.firstrun - fi - fi -} - -startEmu() { - if [ -e /var/emu/`echo "$emu" | cut -d ' ' -f1` ] && [ "$emu" != "off" ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start $emu - fi - /var/emu/$emu - fi -} - -startRmcrash() { - if [ `ls -1 /media/hdd | wc -l` != 0 ] && [ $rmcrashlog = 'y' ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start rmcrashlog - fi - rm -rf /media/hdd/enigma2_crash_*.log > /dev/null 2>&1 - fi -} - -startWebifport() { - if [ `grep "config.plugins.Webinterface.interfaces.0.port=81" /var/usr/local/share/enigma2/settings | wc -l` -eq 1 ] && [ $webif = 'y' ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Patching settings with webif port 80 - fi - sed -e "s!config.plugins.Webinterface.interfaces.0.port=81!config.plugins.Webinterface.interfaces.0.port=80!g" -i /var/usr/local/share/enigma2/settings - fi -} - -startMoviedir() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create Moviedir /media/hdd/movie - fi - if [ `mount | grep /media/hdd | wc -l` -eq 1 ]; then - if [ ! -e /media/hdd/movie ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] create /media/hdd/movie - fi - mkdir /media/hdd/movie - fi - fi -} - -startPl12303() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Load pl12303 modul - fi - if [ -e /lib/modules/usbserial.ko ] && [ -e /lib/modules/pl2303.ko ] && [ "$pl2303" = y ]; then - /sbin/insmod /lib/modules/usbserial.ko - /sbin/insmod /lib/modules/pl2303.ko - fi -} - -startFtdi() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Load ftdi modul - fi - if [ -e /lib/modules/usbserial.ko ] && [ -e /lib/modules/ftdi.ko ] && [ "$ftdi" = y ]; then - /sbin/insmod /lib/modules/usbserial.ko >/dev/null 2>&1 - /sbin/insmod /lib/modules/ftdi.ko - fi -} - -startIp() { - if [ -e /etc/init.d/firststart ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start Boot set Network - fi -# /etc/init.d/firststart - /etc/init.d/networking start - - fi -} - -startProfile() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Create Profile - fi - touch /var/tmp/profile - echo "0.02 PYTHON_START" >> /var/tmp/profile - echo "0.18 LANGUAGE" >> /var/tmp/profile - echo "0.77 LOAD:InfoBar" >> /var/tmp/profile - echo "0.81 LOAD:GUISkin" >> /var/tmp/profile - echo "0.84 LOAD:ElementTree" >> /var/tmp/profile - echo "1.99 LOAD:enigma_skin" >> /var/tmp/profile - echo "2.58 LoadSkin" >> /var/tmp/profile - echo "2.80 LoadSkinDefault" >> /var/tmp/profile - echo "3.07 LoadSkinDefaultDone" >> /var/tmp/profile - echo "3.08 LOAD:Source" >> /var/tmp/profile - echo "3.08 LOAD:GUIComponent" >> /var/tmp/profile - echo "3.47 LOAD:enigma" >> /var/tmp/profile - echo "3.48 LOAD:InfoBarGenerics" >> /var/tmp/profile - echo "3.64 ChannelSelection.py 1" >> /var/tmp/profile - echo "6.86 ChannelSelection.py 2" >> /var/tmp/profile - echo "6.86 ChannelSelection.py 2.1" >> /var/tmp/profile - echo "6.89 ChannelSelection.py 2.2" >> /var/tmp/profile - echo "6.89 ChannelSelection.py 2.3" >> /var/tmp/profile - echo "6.89 ChannelSelection.py 3" >> /var/tmp/profile - echo "6.93 ChannelSelection.py 4" >> /var/tmp/profile - echo "6.95 ChannelSelection.py after imports" >> /var/tmp/profile - echo "7.80 LOAD:InitBar_Components" >> /var/tmp/profile - echo "7.80 LOAD:HelpableScreen" >> /var/tmp/profile - echo "7.81 ParentalControl" >> /var/tmp/profile - echo "7.84 LOAD:Navigation" >> /var/tmp/profile - echo "7.92 LOAD:skin" >> /var/tmp/profile - echo "7.92 LOAD:Tools" >> /var/tmp/profile - echo "7.93 ReloadProfiles" >> /var/tmp/profile - echo "8.01 Twisted" >> /var/tmp/profile - echo "14.61 LOAD:Plugin" >> /var/tmp/profile - echo "14.62 LOAD:Wizard" >> /var/tmp/profile - echo "14.97 misc" >> /var/tmp/profile - echo "14.98 LOAD:ScreenGlobals" >> /var/tmp/profile - echo "15.05 Screen" >> /var/tmp/profile - echo "15.05 Standby,PowerKey" >> /var/tmp/profile - echo "15.06 Scart" >> /var/tmp/profile - echo "15.07 Load:CI" >> /var/tmp/profile - echo "15.09 Load:VolumeControl" >> /var/tmp/profile - echo "15.12 VolumeControl" >> /var/tmp/profile - echo "15.12 Init:skin" >> /var/tmp/profile - echo "15.57 InputDevice" >> /var/tmp/profile - echo "15.58 AVSwitch" >> /var/tmp/profile - echo "15.64 RecordingConfig" >> /var/tmp/profile - echo "15.65 UsageConfig" >> /var/tmp/profile - echo "16.08 keymapparser" >> /var/tmp/profile - echo "16.38 Network" >> /var/tmp/profile - echo "16.44 LCD" >> /var/tmp/profile - echo "16.46 SetupDevices" >> /var/tmp/profile - echo "18.35 RFMod" >> /var/tmp/profile - echo "18.35 Init:CI" >> /var/tmp/profile - echo "18.37 readPluginList" >> /var/tmp/profile - echo "20.65 Init:Session" >> /var/tmp/profile - echo "20.69 wizards" >> /var/tmp/profile - echo "23.03 Init:VolumeControl" >> /var/tmp/profile - echo "23.11 Init:PowerKey" >> /var/tmp/profile - echo "23.13 RunReactor" >> /var/tmp/profile - touch /var/tmp/blacklist - touch /var/tmp/playlist.e2pls - touch /var/tmp/whitelist -} - - -startModule() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Load ntfs and cifs modul - fi - /sbin/insmod /lib/modules/fuse.ko - /sbin/insmod /lib/modules/ntfs.ko - /sbin/insmod /lib/modules/cifs.ko -} - -startRcreboot() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start RC-Reboot - fi - /usr/bin/awk -f /etc/init.d/getfb.awk /dev/input/event0 & -} - -startCrossepg() { - if [ -e /usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/crossepg/crossepg_epgmove.sh ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start CROSSEPG - fi - /usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/crossepg/crossepg_epgmove.sh - fi -} - -startFontsize() { - if [ $fontsize = 'big' ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] set fontsize to $fontsize - fi - FILE=/var/usr/local/share/enigma2/skin_default.xml - sed -e 's!!!g' -i $FILE - sed -e 's!!!g' -i $FILE - fi - if [ $fontsize = 'smal' ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] set fontsize to $fontsize - fi - FILE=/var/usr/local/share/enigma2/skin_default.xml - sed -e 's!!!g' -i $FILE - - sed -e 's!!!g' -i $FILE - fi -} - -startFonts() { - if [ ! -e /var/usr/share/fonts/default.ttf ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] restore default fonts - fi - cp /var/usr/share/fonts/backup-default.ttf /var/usr/share/fonts/default.ttf - fi -} - -startLcdlogo() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start AAF LCD LOGO - fi - /bin/vfdctl -x /bin/aaf_mod.vfdx -} - -startRedbutton() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] stop red button - fi - echo "B" > /dev/ttyAS1 -} - -startBa() { - if [ -e /var/baroot/ba/bainit ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start bainit - fi -# /var/baroot/ba/bainit > /var/ba.log & -# /var/baroot/ba/bainit > /var/ba.log 2>&1 - if [ `mount | grep /dev/mtdblock3 | tail -n 1 | wc -l` -eq 1 ]; then - /var/baroot/ba/bainit > /var/ba.log 2>&1 - fi - fi -} - -startBootdelay() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start set bootdelay 1 - fi - if [ $REBOOT == "2" ]; then - fw_setenv bootdelay 1 - fi -} - -startNetinfodisplay() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start Netinfo - fi - - if [ -e /var/etc/.first ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] start bainit - fi - HELP=`cat /proc/cmdline | sed -e 's#ip=#_#g' | cut -d "_" -f 2` - GW=`echo "$HELP" | cut -d ":" -f 3` - IP=`echo "$HELP" | cut -d ":" -f 1` - MASK=`echo "$HELP" | cut -d ":" -f 4` - DNS=`echo $GW` - echo "auto eth0" > /etc/network/interfaces - echo "iface eth0 inet static" >> /var/etc/network/interfaces - echo " address $IP" >> /var/etc/network/interfaces - echo " netmask $MASK" >> /var/etc/network/interfaces - echo " gateway $GW" >> /var/etc/network/interfaces -# (sleep 40; rm -r /var/etc/.first) & - else - ethfile=/var/etc/network/interfaces - ethcat=`cat $ethfile` - IP=`echo -e "$ethcat" | sed s/"^\s*"// | sed s/" \+"/" "/g | grep "^address" | cut -d " " -f2` - GW=`echo -e "$ethcat" | sed s/"^\s*"// | sed s/" \+"/" "/g | grep "^gateway" | cut -d " " -f2` - MASK=`echo -e "$ethcat" | sed s/"^\s*"// | sed s/" \+"/" "/g | grep "^netmask" | cut -d " " -f2` - DNS=`cat /etc/resolv.conf | cut -d" " -f2` - fi - - if [ $showip = 'status' ]; then - echo "STATIC IP" > /dev/vfd & - fi - if [ $showip = 'ip' ]; then - echo $IP > /dev/vfd & - fi - if [ $showip = 'status' ]; then - echo "DHCP IP" > /dev/vfd & - fi - if [ $showip = 'ip' ]; then - echo $IP > /dev/vfd & - fi - if [ $showiptv = 'y' ]; then - VERSION=`cat /etc/version` - infobox 5 NETZWERK-INFORMATION "IP-ADDRESSE: $IP" "NETMASKE: $MASK" "DNS-SERVER: $DNS" "GATEWAY: $GW" "----------------------" "VERSION: $VERSION" - fi - echo $GW > /var/etc/default_gw -} - -startReboot() { - if [ $REBOOT == "1" ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] SHUTDOWN - fi - /sbin/fuser -k /dev/dvb/adapter0/frontend0 - echo "SHUTDOWN" > /dev/vfd - /var/etc/boot/poweroff.sh & - sleep 3 - killall -9 showiframe - elif [ $REBOOT == "2" ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] REBOOT - fi - killall -9 infobox - /sbin/fuser -k /dev/dvb/adapter0/frontend0 - setfile=/var/usr/local/share/enigma2/settings - setcat=`cat $setfile | grep config.plugins.automount` - start=`echo -e $setcat | grep config.plugins.automount.start | wc -l` - if [ "$fsckrecord" == y ] && [ $start = 0 ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] fsck swapstick - fi - RECORDLABEL=`blkid | grep RECORD | tr " " "\n" | sed 's/://' | grep /dev/` - TYPE=`blkid | grep RECORD | tr " " "\n" | sed 's/://' | sed 's/SEC_TYPE="//' | grep TYPE | sed 's/TYPE="//' | sed 's/"//'` - umount -f $RECORDLABEL - infobox 9999 FSCK-RECORD "Device $RECORDLABEL" "TYPE: $TYPE" & - /sbin/fsck."$TYPE" -f -p "$RECORDLABEL" - killall -9 infobox - infobox 5 INFO "FSCK done" - fi - - if [ "$fsckswap" == y ] && [ $start = 0 ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] fsck swapstick - fi - SWAPLABEL=`blkid | grep SWAP | tr " " "\n" | sed 's/://' | grep /dev/` - TYPE=`blkid | grep SWAP | tr " " "\n" | sed 's/://' | sed 's/SEC_TYPE="//' | grep TYPE | sed 's/TYPE="//' | sed 's/"//'` - swapoff /var/swap/swapfile - umount -f $SWAPLABEL - /sbin/insmod /lib/modules/ramzswap.ko disksize_kb=5000 - mknod /dev/ramzswap0 b 253 0 - swapon /dev/ramzswap0 - infobox 100 FSCK-SWAP "Device $SWAPLABEL" "TYPE: $TYPE" - /sbin/fsck."$TYPE" -y "$SWAPLABEL" - killall -9 infobox - infobox 5 INFO "FSCK done" - fi - echo "REBOOT" > /dev/vfd - /var/etc/boot/poweroff.sh & - sleep 1 - sync - sleep 1 - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Swapoff - fi - swapoff /var/swap/swapfile - sleep 1 - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Stop Emu - fi - killall -9 `cat /var/etc/autostart/start-config | grep emu |cut -d \" -f 2 | cut -d " " -f0` - sleep 1 - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Umount Disks - fi - devlist=`cat /proc/diskstats | cut -c 11- | cut -d " " -f1 | grep "sd[a-z][0-9]"` - for device in $devlist; do - echo $CMD ["$INPUT"] umount -f /dev/"$device" - umount -f /dev/"$device" - done - sleep 1 - elif [ $REBOOT == "3" ]; then - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] E2 RESTART - fi - /sbin/fuser -k /dev/dvb/adapter0/frontend0 - echo "E2 RESTART" > /dev/vfd - else - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] ERROR - fi - echo "ERROR" > /dev/vfd - sleep $errorstop - /sbin/fuser -k /dev/dvb/adapter0/frontend0 - echo "REBOOT" > /dev/vfd - /var/etc/boot/poweroff.sh & - fi -} - - -startFirst() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Boot first - fi - touch /var/etc/.first -} - -startRmfirst() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Remove first - fi - rm /var/etc/.first -} - -startHddicon() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Set HDD Icon - fi - RECORDLABEL=`blkid | grep RECORD | tr " " "\n" | sed 's/://' | grep /dev/` - if [ $RECORDLABEL = "RECORD" ]; then - vfdctl +hdd - fi -} - -startMini() { - if [ ! $debug = 'off' ]; then - echo $CMD ["$INPUT"] Set HDD Icon - fi - if [ -e /var/bin/miniuboot ]; then - infobox 5 Info "Install miniuboot" - /var/bin/flashcp -v /var/bin/miniuboot /dev/mtd6 - fw_setenv ipaddr `cat /var/etc/network/interfaces | sed s/"^\s*"// | sed s/" \+"/" "/g | grep "^address" | cut -d " " -f2` - fw_setenv serverip `cat /var/etc/network/interfaces | sed s/"^\s*"// | sed s/" \+"/" "/g | grep "^gateway" | cut -d " " -f2` - fw_setenv gateway `cat /var/etc/network/interfaces | sed s/"^\s*"// | sed s/" \+"/" "/g | grep "^gateway" | cut -d " " -f2` - fw_setenv gatewayip `cat /var/etc/network/interfaces | sed s/"^\s*"// | sed s/" \+"/" "/g | grep "^gateway" | cut -d " " -f2` - fw_setenv ethaddr `ifconfig | grep HWaddr | sed "s/ \+/ /g" | cut -d " " -f5` - fw_setenv netmask `ifconfig | grep Bcast | cut -d ":" -f4` - fw_setenv bootcmd 'bootm a0030000' - fw_setenv bootdesc_0 '----Flash----' - fw_setenv bootcmd_0 'run bootargs_0; bootm a0040000' - fw_setenv bootargs_0 'set bootargs console=ttyAS0,115200 root=/dev/mtdblock2 ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:kathrein:eth0:off mem=64m coprocessor_mem=4m@0x10000000,4m@0x10400000 rootdelay=0 nwhwconf=device:eth0,hwaddr:${ethaddr} init=/bin/devinit' - fw_setenv bootdesc_9 '----USB-1----' - fw_setenv bootcmd_9 'usb reset;ext2load usb 0:2 a5000000 /boot/uImage;run bootargs_9;bootm a5000000' - fw_setenv bootargs_9 'set bootargs console=ttyAS0,115200 root=/dev/sda2 rw ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:kathrein:eth0:off mem=64m coprocessor_mem=4m@0x10000000,4m@0x10400000 rootdelay=6 nwhwconf=device:eth0,hwaddr:${ethaddr} init=/bin/devinit' - fw_setenv bootdesc_8 '----USB-2----' - fw_setenv bootcmd_8 'usb reset;ext2load usb 0:3 a5000000 /boot/uImage;run bootargs_8;bootm a5000000' - fw_setenv bootargs_8 'set bootargs console=ttyAS0,115200 root=/dev/sda3 rw ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:kathrein:eth0:off mem=64m coprocessor_mem=4m@0x10000000,4m@0x10400000 rootdelay=6 nwhwconf=device:eth0,hwaddr:${ethaddr} init=/bin/devinit' - fw_setenv bootdesc_7 '----USB-3----' - fw_setenv bootcmd_7 'usb reset;ext2load usb 0:4 a5000000 /boot/uImage;run bootargs_7;bootm a5000000' - fw_setenv bootargs_7 'set bootargs console=ttyAS0,115200 root=/dev/sda4 rw ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:kathrein:eth0:off mem=64m coprocessor_mem=4m@0x10000000,4m@0x10400000 rootdelay=6 nwhwconf=device:eth0,hwaddr:${ethaddr} init=/bin/devinit' - rm -f /var/bin/flashcp /var/bin/miniuboot - killall -9 infobox - infobox 5 Info "Install miniuboot done !" - fi -} - - - -if [ $1 = "first" ] ;then - startCompcache & - startServer & - startIp - startModule - startNetinfodisplay & -# startMount -elif [ $1 = "ba" ] ;then - startMount - startBa -elif [ $1 = "e2" ] ;then - startRcreboot & - startPlugload - startFirst & - startEmu & - startProfile & - startFonts - startCrossepg - startLcdlogo & - startRedbutton & - startBootstop -elif [ $1 = "last" ] ;then - startRmfirst & - startStickextensions & - startHddicon - startWebifport & - startLoadmodules & - startAutodns & - startRmplaylist & - startPortmap & - startRmcrash & - startMoviedir & - startPl12303 & - startFtdi & - startSamba & -elif [ $1 = "reboot" ] ;then - startMini - startFontsize - startReboot - startBootdelay - startRmemthy -fi - -exit Index: k/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/url_check.sh =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/url_check.sh (revision 3766) +++ (revision ) @@ -1,34 +1,0 @@ -#!/bin/sh - -rm /tmp/netnetok -rm /tmp/netnetnotok -rm /tmp/netinfook -rm /tmp/netinfonotok - -# Test erster Server -ping -c 1 -W 1 209.85.137.104 -if [ $? -eq 0 ]; then - touch /tmp/netok -else - echo "kein Internet" - touch /tmp/netnotok -fi - -ping -c 1 -W 1 addons.aaf-board.net -if [ $? -eq 0 ]; then - touch /tmp/netnetok -else - echo "kein addons.aaf-board.net" - touch /tmp/netnetnotok - rm /tmp/netnetok -fi - -ping -c 1 -W 1 kati910.aaf-board.info -if [ $? -eq 0 ]; then - touch /tmp/netinfook -else - echo "kein kati910.aaf-board.info" - touch /tmp/netinfonotok - rm /tmp/netinfook -fi -