diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py
index 9d2ec9f..4b51714 100644
--- a/NeoBoot/extract.py
+++ b/NeoBoot/extract.py
@@ -51,7 +51,7 @@ def getCPUtype() :
elif lines.find('mips') != -1:
cpu='MIPS'
return cpu
-
+
def getKernelVersion():
try:
return open('/proc/version', 'r').read().split(' ', 4)[2].split('-', 2)[0]
@@ -319,21 +319,16 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Ste
if SoftCam == 'True':
if os.path.exists('/etc/CCcam.cfg'):
- cmd = 'cp -r -f /etc/CCcam.cfg %s/ImageBoot/%s/etc > /dev/null 2>&1' % (media, target)
+ cmd = 'cp -r /etc/CCcam.cfg %s/ImageBoot/%s/etc > /dev/null 2>&1' % (media, target)
rc = os.system(cmd)
if os.path.exists('/etc/tuxbox/config'):
- cmd = 'cp -r -f /etc/tuxbox/config %s/ImageBoot/%s/etc/tuxbox > /dev/null 2>&1' % (media, target)
+ cmd = 'cp -r /etc/tuxbox/config %s/ImageBoot/%s/etc/tuxbox > /dev/null 2>&1' % (media, target)
rc = os.system(cmd)
- if os.path.exists('/etc/init.d/softcam.oscam'):
- cmd = 'cp -r -f -p /etc/init.d/softcam.osca* %s/ImageBoot/%s/etc/init.d > /dev/null 2>&1' % (media, target)
- rc = os.system(cmd)
- if os.path.exists('/etc/init.d/softcam.None'):
- cmd = 'cp -r -f -p /etc/init.d/softcam.None %s/ImageBoot/%s/etc/init.d > /dev/null 2>&1' % (media, target)
- rc = os.system(cmd)
- if os.path.exists('/etc/init.d/softcam.CCcam'):
- cmd = 'cp -r -f -p /etc/init.d/softcam.softcam.CCcam %s/ImageBoot/%s/etc/init.d > /dev/null 2>&1' % (media, target)
- rc = os.system(cmd)
-
+ os.system('tar -czf /tmp/NeoBoot_CAM.tar.gz /usr/bin/*cam* /etc/init.d/softcam*') > /dev/null 2>&1
+ cmd1= 'cp -r /tmp/NeoBoot_CAM.tar.gz %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files > /dev/null 2>&1' % (media, target)
+ rc = os.system(cmd1)
+ os.system('echo "Przeniesiono pliki softcam do instalowanego image..."')
+
if MediaPortal == 'True':
if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal'):
cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/MediaPortal %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
@@ -396,12 +391,14 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Ste
cmd = 'touch %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
rc = os.system(cmd)
cmd = 'grep "config.Nims" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
- rc = os.system(cmd)
+ rc = os.system(cmd)
+ cmd = 'grep "av.videomode.DVI" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
+ rc = os.system(cmd)
cmd = 'grep "config.OpenWebif" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
rc = os.system(cmd)
cmd = 'grep "config.osd" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
rc = os.system(cmd)
- cmd = 'grep "config.timezone" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
+ cmd = 'grep "config.timezone.val" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
rc = os.system(cmd)
cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/S50fat.sh %s/ImageBoot/%s/etc/rcS.d' % (media, target)
rc = os.system(cmd)
@@ -608,6 +605,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Ste
os.system('rm -f /tmp/init4; init 3')
os.system('echo "End of installation:"; date +%T')
+ os.system('echo "Nacisnij zielony, by zapisac log.txt procesu instalacji w /tmp"')
def RemoveUnpackDirs():
os.chdir(media + '/ImagesUpload')
@@ -670,6 +668,11 @@ def RemoveUnpackDirs():
rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/force_h9combo_READ.ME ' + getNeoLocation() + 'ImagesUpload/h9combo; mv ' + getNeoLocation() + 'ImagesUpload/unforce_h9combo.txt ' + getNeoLocation() + 'ImagesUpload/h9combo')
rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/h9combo')
+ elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/h10'):
+ rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/force_h10_READ.ME ' + getNeoLocation() + 'ImagesUpload/h10; mv ' + getNeoLocation() + 'ImagesUpload/unforce_h10.txt ' + getNeoLocation() + 'ImagesUpload/h10')
+ rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/h10')
+
+
elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/uclan'):
rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/usb_update.bin ' + getNeoLocation() + 'ImagesUpload/uclan')
rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/uclan')
@@ -699,7 +702,7 @@ def RemoveUnpackDirs():
def NEOBootExtract(source, target, ZipDelete, BlackHole):
RemoveUnpackDirs()
- os.system('echo "Installation started:"; date +%T;echo "Extracting the installation file..."')
+ os.system('echo "Installation started:"; date +%T;echo "Extracting the installation file...\nNacisnij zielony by ukryc Console lub czeerwony by przerwac instalacje"')
if os.path.exists('' + getNeoLocation() + 'ImageBoot/.without_copying'):
os.system('rm -f ' + getNeoLocation() + 'ImageBoot/.without_copying')
@@ -1203,6 +1206,11 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/h9combo/rootfs.tar.bz2; tar -jxf ' + getNeoLocation() + 'ImagesUpload/h9combo/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
rc = os.system(cmd)
+ elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/h10/rootfs.tar.bz2'):
+ os.system('echo "Please wait. System installation Zgemma h10 ."')
+ cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/h10/rootfs.tar.bz2; tar -jxf ' + getNeoLocation() + 'ImagesUpload/h10/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+ rc = os.system(cmd)
+
elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/miraclebox/mini4k'):
os.system('echo "Please wait. System installation Miraclebox mini4k."')
cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/miraclebox/mini4k/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/miraclebox/mini4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py
index 1ca3cd2..1efd79e 100644
--- a/NeoBoot/plugin.py
+++ b/NeoBoot/plugin.py
@@ -4,14 +4,15 @@
#neoboot modules
from __init__ import _
-from Plugins.Extensions.NeoBoot.files.stbbranding import getLabelDisck, getINSTALLNeo, getNeoLocation, getLocationMultiboot, getNeoMount, getNeoMount2, getNeoMount3, getNeoMount4, getNeoMount5, getFSTAB, getFSTAB2, getKernelVersionString, getKernelImageVersion, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getTunerModel
-from Plugins.Extensions.NeoBoot.files import Harddisk
+from files.stbbranding import getLabelDisck, getINSTALLNeo, getNeoLocation, getLocationMultiboot, getNeoMount, getNeoMount2, getNeoMount3, getNeoMount4, getNeoMount5, getFSTAB, getFSTAB2, getKernelVersionString, getKernelImageVersion, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getTunerModel
+from files import Harddisk
from Components.About import about
from enigma import getDesktop
from enigma import eTimer
import urllib2, urllib
from Screens.Screen import Screen
from Screens.Console import Console
+#from files.nConsole import Console
from Screens.MessageBox import MessageBox
from Screens.ChoiceBox import ChoiceBox
from Screens.VirtualKeyBoard import VirtualKeyBoard
@@ -49,7 +50,7 @@ LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot'
# warranty, use at YOUR own risk.
PLUGINVERSION = '8.01'
-UPDATEVERSION = '8.20'
+UPDATEVERSION = '8.21'
def Freespace(dev):
statdev = os.statvfs(dev)
@@ -529,7 +530,7 @@ class NeoBootInstallation(Screen):
os.system('opkg install util-linux-sfdisk')
# ARM - OctagonSF4008 - DM900 - Zgemma h7S - Octagon sf 8008 - AX HD60 4K #gbquad4k arm , #osmio4k arm, #Zgemma h9 arm, #Zgemma h7S arm , #Octagon SF4008
- if getBoxHostName() == 'ax51' or getBoxHostName() == 'dm920' or getBoxHostName() == 'et1x000' or getBoxHostName() == 'ustym4kpro' or getTunerModel() == 'ustym4kpro' or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k' or getBoxHostName == 'osmio4k' or getBoxHostName() == 'zgemmah9s' or getBoxHostName() == 'h9combo' or getBoxHostName() == 'ax60' or getBoxHostName() == 'sf8008' or getCPUSoC() == 'bcm7251' or getCPUSoC() == 'BCM97252SSFF' or getBoxHostName() == 'dm900':
+ if getBoxHostName() == 'ax51' or getBoxHostName() == 'dm920' or getBoxHostName() == 'et1x000' or getBoxHostName() == 'ustym4kpro' or getTunerModel() == 'ustym4kpro' or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k' or getBoxHostName == 'osmio4k' or getBoxHostName() == 'zgemmah9s' or getBoxHostName() == 'h9combo' or getBoxHostName() == 'h10' or getBoxHostName() == 'ax60' or getBoxHostName() == 'sf8008' or getCPUSoC() == 'bcm7251' or getCPUSoC() == 'BCM97252SSFF' or getBoxHostName() == 'dm900':
os.system('cp -f ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init; mv ' + LinkNeoBoot + '/target/arm_run.py ' + LinkNeoBoot + '/run.py; cd')
#VUPLUS ARM
@@ -673,7 +674,7 @@ class NeoBootImageChoose(Screen):
screenwidth = getDesktop(0).size().width()
if screenwidth and screenwidth == 1920:
skin = """
- """
+ """
else:
skin = """
\n\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t Format:%A %e %B %Y \t\t\t"""
@@ -797,9 +798,9 @@ class NeoBootImageChoose(Screen):
if getBoxHostName() == 'zgemmah9s':
os.system('mkdir -p /media/mmc; mount /dev/mmcblk0p7 /media/mmc')
- if os.path.exists('/proc/stb/info/boxtype'):
- if getBoxHostName() == 'zgemmah9combo':
- os.system('mkdir -p /media/mmc; mount /dev/mmcblk0p7 /media/mmc')
+# if os.path.exists('/proc/stb/info/boxtype'):
+# if getBoxHostName() == 'zgemmah9combo':
+# os.system('mkdir -p /media/mmc; mount /dev/mmcblk0p7 /media/mmc')
if getBoxHostName == 'sf8008':
os.system('mkdir -p /media/mmc; mount /dev/mmcblk0p13 /media/mmc')
@@ -1220,6 +1221,7 @@ class NeoBootImageChoose(Screen):
elif mypath == self.mysel:
self.session.open(MessageBox, _('Sorry you cannot delete the image currently booted from.'), MessageBox.TYPE_INFO, 5)
else:
+
out = open('%sImageBoot/.neonextboot' % getNeoLocation(), 'w' )
out.write('Flash')
out.close()
@@ -1248,8 +1250,9 @@ class NeoBootImageChoose(Screen):
def remove2(self, yesno):
if yesno:
cmd = _("echo -e 'Deleting in progress...\n'")
- cmd1 = 'rm -r %sImageBoot/' % getNeoLocation() + self.mysel
- self.session.openWithCallback(self.up, Console, _('NeoBoot: Deleting Image'), [cmd, cmd1])
+ cmd1 = 'chattr -i %sImageBoot/' % getNeoLocation() + self.mysel
+ cmd2 = 'rm -r %sImageBoot/' % getNeoLocation() + self.mysel
+ self.session.openWithCallback(self.up, Console, _('NeoBoot: Deleting Image'), [cmd, cmd1, cmd2])
else:
self.session.open(MessageBox, _('Removing canceled!'), MessageBox.TYPE_INFO)
@@ -1268,6 +1271,7 @@ class NeoBootImageChoose(Screen):
if yesno:
if getCPUSoC() or getBoxHostName() or getTunerModel() == ['zgemmah9s',
'h9combo',
+ 'h10',
'osmio4k',
'bcm7252s',
'gbquad4k',