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 3392) +++ ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py (revision 3393) @@ -828,10 +828,7 @@ if self.box == "cuberevo" or self.box == "cuberevo-mini" or self.box == "cuberevo-mini2": self.box = "cuberevo" - # ocatgon1008 = av700 - #if self.box == "octagon1008": - # self.box = "hdbox" - #if self.box == "ufs910" or self.box == "hdbox": - # self.box = "ufs910" - # print "[Addon-Manager]" + self.box + if self.box == "ufs910" or self.box == "hdbox": + self.box = "ufs910" + print "[Addon-Manager]" + self.box #----- you press au Menu-key, define the urls---------------------------------- @@ -1304,22 +1301,4 @@ file.close() - ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") - ffile.write("ausgelesene Box:" + self.box) - ffile.write("\n") - ffile.close() - # Topfield "TF7700HDPVR" - if self.box == "cuberevo" or self.box == "cuberevo-mini" or self.box == "cuberevo-mini2": - self.box = "cuberevo" - # ocatgon1008 = av700 - #if self.box == "octagon1008": - # self.box = "hdbox" - #if self.box == "ufs910" or self.box == "hdbox": - # self.box = "ufs910" - - ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") - ffile.write("zugeordnete Box:" + self.box) - ffile.write("\n") - ffile.close() - self["statusbar"].text = _("Decompressing Tar-File...") os.system("cd /tmp/aaf; tar -xzf downfile.tar.gz; sync") @@ -1352,14 +1331,13 @@ freesize = int(freesize) print "[Addon-Manager] Flash=", freesize - #GOst cut -c1-4 -nach cut -d\t -f1 - os.system("sync; sleep 2") + #GOst ---> cut -c1-4 -nach-> cut -d\t -f1 os.system("du -sc /tmp/aaf |grep total|cut -d\t -f1 >/tmp/free2.txt") - #if os.path.exists("/tmp/free2.txt") is True: - # f = open("/tmp/free2.txt", "r" ) - # for line in f: - # filesize = line.lstrip() - # f.close - # filesize = filesize.replace("\n","") - # filesize = int(filesize) + if os.path.exists("/tmp/free2.txt") is True: + f = open("/tmp/free2.txt", "r" ) + for line in f: + filesize = line.lstrip() + f.close + filesize = filesize.replace("\n","") + filesize = int(filesize) print "[Addon-Manager] File=", filesize @@ -1427,17 +1405,17 @@ # und nun in der ufs910 im Flash den emu installieren os.system("rm /tmp/aaf/*.tar.gz ; sync") - os.system("cp -RP /tmp/aaf/* / ; sync") + #os.system("cp -RP /tmp/aaf/* / ; sync") # error when by softlink + os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cd /tmp/aaf; cp_r /tmp/aaf /)" ) + if self.swaptest == True: os.system("cd /usr/lib/enigma2/python/Plugins/Extensions/AddonManager; ./do_link.sh") print "[Addon-Manager] Emu wude nach /var/swap/bin verlinkt" + # 14.03.2010 abgeschaltet wegen TF Softlink if os.path.exists("/tmp/aaf/inst.sh") is True: print "[Addon-Manager] Preinst gefunden (inst.sh)" - #os.system("sed -e 's/cp -RP /. \/usr\/lib\/enigma2\/python\/Plugins\/Extensions\/AddonManager\/cp_r.func; cp_r \/tmp\/aaf\//g' -i /tmp/aaf/inst.sh") - #os.system("sed -e 's/cp -RP /cp_r /g' -i /tmp/aaf/inst.sh") - #os.system("cd /tmp/aaf; ./inst.sh" ) - os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cd /tmp/aaf; ./inst.sh)" ) - #os.system("rm -r /tmp/aaf") - #os.system("cd / ; rm *tar.gz ; rm inst.sh") + #os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cd /tmp/aaf; ./inst.sh)" ) + os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cd /tmp/aaf; cp_r /tmp/aaf /; sync)" ) + else: # Boxtyp lesen @@ -1446,13 +1424,4 @@ file.close() # Topfield "TF7700HDPVR" - if self.box == "cuberevo" or self.box == "cuberevo-mini" or self.box == "cuberevo-mini2": - self.box = "cuberevo" - # ocatgon1008 = av700 - #if self.box == "octagon1008": - # self.box = "hdbox" - #if self.box == "ufs910" or self.box == "hdbox": - # self.box = "ufs910" - - # Topfield "TF7700HDPVR" ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") ffile.write("erkannter Boxtyp:" + self.box) @@ -1472,5 +1441,5 @@ self.box = "cuberevo" - if self.box == "ufs910" or self.box == "UFS922" or self.box == "cuberevo" or self.box == "hdbox": + if self.box == "ufs910" or self.box == "UFS922" or self.box == "cuberevo": if self.plug == "bootbilder" or self.plug == "plugins": ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") @@ -1543,10 +1512,12 @@ ffile.write("es ist ein Flashimage aber keine ufs910") ffile.write("\n") - ffile.write("cp -RP /tmp/aaf/* / ; sync") + ffile.write("cp_r /tmp/aaf / ; sync") ffile.write("\n") ffile.close() #GOst begin #os.system("cp -RP /tmp/aaf/* / ; sync") - os.system("(cd /tmp/aaf; tar -xzf *tar.gz -C / ; sync)") + os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cd /tmp/aaf; cp_r /tmp/aaf / ; sync)" ) + + #os.system("(cd /tmp/aaf; tar -xzf *tar.gz -C / ; sync)") #GOst end @@ -1556,10 +1527,10 @@ ffile.write("es ist kein Flashimage") ffile.write("\n") - ffile.write("cp -RP /tmp/aaf/* / ; sync") + ffile.write("cp_r /tmp/aaf / ; sync") ffile.write("\n") ffile.close() #GOst begin - #os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cp_r /tmp/aaf / ; sync)") - os.system("(cd /tmp/aaf; tar -xzf *tar.gz -C / ; sync)") + os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cp_r /tmp/aaf / ; sync)") + #os.system("(cd /tmp/aaf; tar -xzf *tar.gz -C / ; sync)") #GOst end @@ -1576,4 +1547,7 @@ os.system("rm -r /tmp/aaf") + + os.system("rm -r /tmp/aaf") + os.system("cd / ; rm *tar.gz") os.system("mkdir /tmp/aaf") self["statusbar"].text = _("Installation OK!")