diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py index da70d86..97d3098 100644 --- a/NeoBoot/plugin.py +++ b/NeoBoot/plugin.py @@ -44,7 +44,7 @@ import time # warranty, use at YOUR own risk. PLUGINVERSION = '2.00 ' -UPDATEVERSION = '2.02' +UPDATEVERSION = '2.03' class MyUpgrade(Screen): screenwidth = getDesktop(0).size().width() @@ -707,8 +707,6 @@ class NeoBootInstallation(Screen): else: self.messagebox = self.session.open(MessageBox, _('Canceled ... NeoBoot will not work properly !!! NeoBoot works only on VuPlus box, Ultimo4k, Solo4k, Uno4k !!!'), MessageBox.TYPE_INFO, 20) - - os.system('touch /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neobootup.sh') cel = open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neobootup.sh', 'w') cel.write('#!/bin/sh\n#DESCRIPTION=This script by gutosie\n\ntouch /tmp/.init_reboot\n\nif [ -f /etc/init.d/neobootmount.sh ] ; then\n sync; rm -f /etc/init.d/neobootmount.sh; \nfi \n') @@ -762,32 +760,33 @@ class NeoBootInstallation(Screen): os.system('chmod 644 /media/neoboot/ImagesUpload/.kernel/*') os.system('chmod 755 /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/*') - if fileExists("/proc/stb/info/vumodel") and not fileExists("/proc/stb/info/boxtype"): - if fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): - self.myclose2(_('NeoBoot has been installed succesfully !' )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): - self.myclose2(_('Error - nie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxVuModel()) )) + if fileExists("/proc/stb/info/vumodel") and not fileExists("/proc/stb/info/boxtype"): + if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): + self.myclose2(_('Error - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxVuModel()) )) + if not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz'): + self.myclose2(_('Error - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela vmlinux.gz ')) + else: + self.myclose2(_('NeoBoot has been installed succesfully !' )) #Ultra - if getCPUSoC() == 'bcm7424' or getBoxHostName == 'mbultra' or getTunerModel() == 'ini-8000sv': - if fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): - self.myclose2(_('NeoBoot has been installed succesfully !' )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): - self.myclose2(_('Error - nie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) - - else: + if getCPUSoC() == 'bcm7424' or getBoxHostName == 'mbultra' or getTunerModel() == 'ini-8000sv': + if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): + self.myclose2(_('Error - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) + if not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz'): + self.myclose2(_('Error - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela vmlinux.gz ')) + else: self.myclose2(_('NeoBoot has been installed succesfully !' )) #Edision OS MINI - if getCPUSoC() == 'BCM7362' or getBoxHostName == 'osmini': - if fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): - self.myclose2(_('NeoBoot has been installed succesfully !' )) - elif not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): - self.myclose2(_('Error - nie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) - + if getCPUSoC() == 'BCM7362' or getBoxHostName == 'osmini': + if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): + self.myclose2(_('Error - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) + if not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz'): + self.myclose2(_('Error - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela vmlinux.gz ')) + else: + self.myclose2(_('NeoBoot has been installed succesfully !' )) else: self.myclose2(_('NeoBoot has been installed succesfully !' )) - except: pass else: diff --git a/NeoBoot/run.py b/NeoBoot/run.py index 7410c68..2d4b7d9 100644 --- a/NeoBoot/run.py +++ b/NeoBoot/run.py @@ -140,36 +140,41 @@ class StartImage(Screen): #MiracleBox Ultra - MIPS #Test elif getCPUtype() != 'ARMv7' and getCPUSoC() == 'bcm7424' or getTunerModel() == 'ini-8000sv': - if getImageNeoBoot() == 'Flash': - if fileExists('/.multinfo'): - cmd2='/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/mbultra_dev_mtd2.sh' - self.session.open(Console, _('NeoBoot MiracleBox Ultra...'), [cmd2]) - elif not fileExists('/.multinfo'): - self.session.open(TryQuitMainloop, 2) + if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): + self.myclose2(_('Error - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) + if not fileExists('/media/neoboot/ImagesUpload/.kernel/vmlinux.gz'): + self.myclose2(_('#############>>>>>>>>>\n\n\nError 2 - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela vmlinux.gz ')) + else: - elif getImageNeoBoot() != 'Flash': - if not fileExists('/.multinfo'): - if not fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz ' % ( getImageNeoBoot(), getBoxHostName())): - cmd2='ln -sfn /sbin/neoinitmips /sbin/init; reboot -d -f -h -i' - self.session.open(Console, _('NeoBoot MiracleBox Ultra Rebooting....'), [cmd2]) - elif fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())): - cmd2='ln -sfn /sbin/neoinitmips /sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/mbultra_dev_mtd2.sh' - self.session.open(Console, _('NeoBoot MiracleBox Ultra....'), [cmd2]) + if getImageNeoBoot() == 'Flash': + if fileExists('/.multinfo'): + cmd2='/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/mbultra_dev_mtd2.sh' + self.session.open(Console, _('NeoBoot MiracleBox Ultra...'), [cmd2]) + elif not fileExists('/.multinfo'): + self.session.open(TryQuitMainloop, 2) - elif fileExists('/.multinfo'): - if not fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())): - cmd2='ln -sfn /sbin/init.sysvinit /sbin/init; opkg install --force-reinstall --force-overwrite --force-downgrade /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk; reboot -d -f -h -i' % getBoxHostName() - self.session.open(Console, _('NeoBoot MiracleBox Ultra Rebooting....'), [cmd2]) - elif fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())): - cmd2='ln -sfn /sbin/init.sysvinit /sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/mbultra_dev_mtd2.sh' - self.session.open(Console, _('NeoBoot MiracleBox Ultra....'), [cmd2]) + elif getImageNeoBoot() != 'Flash': + if not fileExists('/.multinfo'): + if not fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz ' % ( getImageNeoBoot(), getBoxHostName())): + cmd2='ln -sfn /sbin/neoinitmips /sbin/init; reboot -d -f -h -i' + self.session.open(Console, _('NeoBoot MiracleBox Ultra Rebooting....'), [cmd2]) + elif fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())): + cmd2='ln -sfn /sbin/neoinitmips /sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/mbultra_dev_mtd2.sh' + self.session.open(Console, _('NeoBoot MiracleBox Ultra....'), [cmd2]) - else: - os.system('echo "Flash " >> /media/neoboot/ImageBoot/.neonextboot') - self.messagebox = self.session.open(MessageBox, _('Wygląda na to że model STB nie jest wpierany przez multiboota!!! '), MessageBox.TYPE_INFO, 8) - self.close() - - + elif fileExists('/.multinfo'): + if not fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())): + cmd2='ln -sfn /sbin/init.sysvinit /sbin/init; opkg install --force-reinstall --force-overwrite --force-downgrade /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk; reboot -d -f -h -i' % getBoxHostName() + self.session.open(Console, _('NeoBoot MiracleBox Ultra Rebooting....'), [cmd2]) + elif fileExists('/media/neoboot/ImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())): + cmd2='ln -sfn /sbin/init.sysvinit /sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/mbultra_dev_mtd2.sh' + self.session.open(Console, _('NeoBoot MiracleBox Ultra....'), [cmd2]) + + else: + os.system('echo "Flash " >> /media/neoboot/ImageBoot/.neonextboot') + self.messagebox = self.session.open(MessageBox, _('Wygląda na to że model STB nie jest wpierany przez multiboota!!! '), MessageBox.TYPE_INFO, 8) + self.close() + #Edision OS MINI - MIPS #Test elif getCPUtype() != 'ARMv7' and getCPUSoC() == 'BCM7362' or getBoxHostName() == 'osmini': if getImageNeoBoot() == 'Flash': @@ -256,31 +261,36 @@ class StartImage(Screen): #VUPLUS ARM - vu_mmcblk0p1.sh elif getCPUSoC() == '7444s' or getBoxHostName() == 'vuultimo4k' or getCPUSoC() == '7376' or getBoxHostName() == 'vusolo4k' or getCPUSoC() == '7252s' or getBoxHostName() == 'vuuno4kse': - if getImageNeoBoot() == 'Flash': - if fileExists('/.multinfo'): - cmd1='/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/vu_mmcblk0p1.sh' - self.session.open(Console, _('NeoBoot Arm....'), [cmd1]) - elif not fileExists('/.multinfo'): - self.session.open(TryQuitMainloop, 2) - elif getImageNeoBoot() != 'Flash': - if not fileExists('/.multinfo'): - if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): - cmd1='ln -sfn /sbin/neoinitarm /sbin/init; reboot -d -f -h -i' - self.session.open(Console, _('NeoBoot Arm....'), [cmd1]) - elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): - cmd1='ln -sfn /sbin/neoinitarmvu /sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/vu_mmcblk0p1.sh' - self.session.open(Console, _('NeoBoot Arm....'), [cmd1]) - elif fileExists('/.multinfo'): - if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): - cmd1='cd /media/mmc; ln -sf /sbin/neoinitarm /media/mmc/sbin/init; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk; reboot -d -f -h -i' % getBoxVuModel() - self.session.open(Console, _('NeoBoot Arm....'), [cmd1]) - elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): - cmd1='cd /media/mmc; ln -sfn /sbin/neoinitarmvu /media/mmc/sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/vu_mmcblk0p1.sh' - self.session.open(Console, _('NeoBoot Arm....'), [cmd1]) + if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): + self.myclose2(_('Error - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) + if not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxVuModel()) ): + self.myclose2(_('#############>>>>>>>>>\n\n\nError 2 - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela vmlinux.gz ')) else: - os.system('echo "Flash " >> /media/neoboot/ImageBoot/.neonextboot') - self.messagebox = self.session.open(MessageBox, _('Wygląda na to że Twój model STB nie jest wpierany!!! '), MessageBox.TYPE_INFO, 8) - self.close() + if getImageNeoBoot() == 'Flash': + if fileExists('/.multinfo'): + cmd1='/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/vu_mmcblk0p1.sh' + self.session.open(Console, _('NeoBoot Arm....'), [cmd1]) + elif not fileExists('/.multinfo'): + self.session.open(TryQuitMainloop, 2) + elif getImageNeoBoot() != 'Flash': + if not fileExists('/.multinfo'): + if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): + cmd1='ln -sfn /sbin/neoinitarm /sbin/init; reboot -d -f -h -i' + self.session.open(Console, _('NeoBoot Arm....'), [cmd1]) + elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): + cmd1='ln -sfn /sbin/neoinitarmvu /sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/vu_mmcblk0p1.sh' + self.session.open(Console, _('NeoBoot Arm....'), [cmd1]) + elif fileExists('/.multinfo'): + if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): + cmd1='cd /media/mmc; ln -sf /sbin/neoinitarm /media/mmc/sbin/init; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk; reboot -d -f -h -i' % getBoxVuModel() + self.session.open(Console, _('NeoBoot Arm....'), [cmd1]) + elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxVuModel())): + cmd1='cd /media/mmc; ln -sfn /sbin/neoinitarmvu /media/mmc/sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/vu_mmcblk0p1.sh' + self.session.open(Console, _('NeoBoot Arm....'), [cmd1]) + else: + os.system('echo "Flash " >> /media/neoboot/ImageBoot/.neonextboot') + self.messagebox = self.session.open(MessageBox, _('Wygląda na to że Twój model STB nie jest wpierany!!! '), MessageBox.TYPE_INFO, 8) + self.close() #VUPLUS ARM - vu_mmcblk0p4.sh elif getCPUSoC() == '72604' or getBoxHostName() == 'vuzero4k': @@ -400,3 +410,6 @@ class StartImage(Screen): self.messagebox = self.session.open(MessageBox, _('Wygląda na to że model STB nie jest wpierany przez NEOBOOT !!! '), MessageBox.TYPE_INFO, 8) self.close() + def myclose2(self, message): + self.session.open(MessageBox, message, MessageBox.TYPE_INFO) + self.close() \ No newline at end of file