update 9.04

NeoBoot/__init__.py

@@ -9,7 +9,7 @@ PluginLanguagePath = 'Extensions/NeoBoot/locale'
 def localeInit():
     lang = language.getLanguage()[:2]
     os.environ['LANGUAGE'] = lang
-    print '[NeoBoot] set language to ', lang
+#    print '[NeoBoot] set language to ', lang
     gettext.bindtextdomain(PluginLanguageDomain, resolveFilename(SCOPE_PLUGINS, PluginLanguagePath))
 
 

NeoBoot/ex_init.py

@@ -0,0 +1,6 @@
+                                                                                                                                                       
+import sys, extract
+if len(sys.argv) < 14:
+    pass
+else:
+    extract.NEOBootMainEx(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6], sys.argv[7], sys.argv[8], sys.argv[9], sys.argv[10], sys.argv[11], sys.argv[12], sys.argv[13] , sys.argv[14])       

NeoBoot/extract.py

@@ -75,7 +75,7 @@ mediahome = media + '/ImageBoot/'
 extensions_path = '/usr/lib/enigma2/python/Plugins/Extensions/'
 dev_null = ' > /dev/null 2>&1'
 
-def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Sterowniki, InstallSettings, ZipDelete, RepairFTP, SoftCam, MediaPortal, BlackHole):
+def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, LanWlan, Sterowniki, InstallSettings, ZipDelete, RepairFTP, SoftCam, MediaPortal, BlackHole):
     media_target = mediahome + target
     list_one = ['rm -r ' + media_target + dev_null, 'mkdir ' + media_target + dev_null, 'chmod -R 0777 ' + media_target]
     for command in list_one:
@@ -243,6 +243,31 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Ste
             rc = os.system(cmd)
             os.system('echo "Copied TV list..."')
 
+        if LanWlan == 'True':
+            if os.path.exists('%s/ImageBoot/%s/etc/vtiversion.info' % (media, target)):
+                os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."')
+            elif os.path.exists('/etc/vtiversion.info') and os.path.exists('%s/usr/lib/enigma2/python/Plugins/PLi' % (media, target)):
+                os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."')
+            elif os.path.exists('/etc/bhversion') and os.path.exists('%s/usr/lib/enigma2/python/Plugins/PLi' % (media, target)):
+                os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."')
+            else:                
+                if os.path.exists('/etc/wpa_supplicant.wlan0.conf'):
+                    cmd = 'cp -Rpf /etc/wpa_supplicant.wlan0.conf %s/ImageBoot/%s/etc/wpa_supplicant.wlan0.conf > /dev/null 2>&1' % (media, target)
+                    rc = os.system(cmd)
+                if os.path.exists('/etc/network/interfaces'):
+                    cmd = 'cp -r /etc/network/interfaces %s/ImageBoot/%s/etc/network/interfaces > /dev/null 2>&1' % (media, target)
+                    rc = os.system(cmd)
+                if os.path.exists('/etc/wpa_supplicant.conf'):
+                    cmd = 'cp -Rpf /etc/wpa_supplicant.conf %s/ImageBoot/%s/etc/wpa_supplicant.conf > /dev/null 2>&1' % (media, target)
+                    rc = os.system(cmd)
+                if os.path.exists('/etc/resolv.conf'):
+                    cmd = 'cp -Rpf /etc/resolv.conf %s/ImageBoot/%s/etc/resolv.conf > /dev/null 2>&1' % (media, target)
+                    rc = os.system(cmd)
+                if os.path.exists('/etc/wl.conf.wlan3'):
+                    cmd = 'cp -r /etc/wl.conf.wlan3 %s/ImageBoot/%s/etc/wl.conf.wlan3 > /dev/null 2>&1' % (media, target)
+                    rc = os.system(cmd)
+            os.system('echo "Copied LAN-WLAN..."')
+
         if Sterowniki == 'True':
             if os.path.exists('%s/ImageBoot/%s/lib/modules' % (media, target)):
                 cmd = 'rm -r %s/ImageBoot/%s/lib/modules' % (media, target)
@@ -380,11 +405,14 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Ste
                 rc = os.system(cmd)
 
         if not os.path.exists('%s/ImageBoot/%s/etc/init.d/rc.local' % (media, target)) and not os.path.exists('%s/ImageBoot/%s/etc/rc.local' % (media, target)) :  
-            cmd = 'ln -s %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/userscript.sh %s/ImageBoot/%s/etc/rcS.d/S99neo.local' % (media,
+            if os.path.exists('%s/ImageBoot/%s/etc/init.d' % (media, target)):                  
-             target,                 
+                cmd = 'ln -s %sImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/userscript.sh %sImageBoot/%s/etc/rcS.d/S99neo.local' % (media,
-             media,
+                 target,                 
-             target)
+                 media,
-            rc = os.system(cmd)
+                 target)
+                rc = os.system(cmd)
+            elif not os.path.exists('%s/ImageBoot/%s/etc/init.d' % (media, target)):
+                os.system('echo "/etc/init.d not found."')
 
     if not os.path.exists('' + getNeoLocation() + 'ImageBoot/.without_copying'):         
         if not os.path.exists('%s/ImageBoot/%s/etc/enigma2' % (media, target)):
@@ -676,7 +704,8 @@ def RemoveUnpackDirs():
         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') 
+        if os.path.exists('' + getNeoLocation() + 'ImagesUpload/usb_update.bin'):    
+            rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/usb_update.bin ' + getNeoLocation() + 'ImagesUpload/uclan') 
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/uclan') 
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/beyonwiz'):
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/apploader.bin ' + getNeoLocation() + 'ImagesUpload/beyonwiz') 
@@ -701,6 +730,16 @@ def RemoveUnpackDirs():
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/bootargs.bin ' + getNeoLocation() + 'ImagesUpload/gigablue') 
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/fastboot.bin ' + getNeoLocation() + 'ImagesUpload/gigablue')  
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/gigablue')                
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz'):
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz')
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz') :
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz')        
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/rootfs.tar.bz2') :
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.bz2')
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/et10000') :
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/et10000')
+
+
  
 def NEOBootExtract(source, target, ZipDelete, BlackHole):
     RemoveUnpackDirs()
@@ -1125,6 +1164,23 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             cmd = 'rm -rf ' + getNeoLocation() + 'ubi'
             rc = os.system(cmd)
             
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/et10000/rootfs.bin'):
+            os.chdir('et10000')
+            os.system('mv -f rootfs.bin rootfs.bin')                    
+            os.system('echo "Instalacja - ubi_reader w toku..."')            
+            print '[NeoBoot] Extracting UBIFS image and moving extracted image to our target'
+            cmd = 'chmod 777 ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py'
+            rc = os.system(cmd)
+            cmd = 'python ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py rootfs.bin -o ' + getNeoLocation() + 'ubi'
+            rc = os.system(cmd)
+            os.chdir('/home/root')
+            cmd = 'cp -r -p ' + getNeoLocation() + 'ubi/rootfs/* ' + getNeoLocation() + 'ImageBoot/' + target
+            rc = os.system(cmd)
+            cmd = 'chmod -R +x ' + getNeoLocation() + 'ImageBoot/' + target
+            rc = os.system(cmd)
+            cmd = 'rm -rf ' + getNeoLocation() + 'ubi'
+            rc = os.system(cmd)            
+
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/sf4008'):
             os.system('echo "Please wait. System installation Octagon SF4008."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/sf4008/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/sf4008/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
@@ -1139,12 +1195,11 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             rc = os.system(cmd)
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/dm900'):
             os.system('echo "Please wait. System installation Dreambox DM900."')
-            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/dm900/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/dm900/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/dm900/rootfs.tar.bz2; tar -jxf ' + getNeoLocation() + 'ImagesUpload/dm900/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd)                                                     
-        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/%s.tar.xz' % source):
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/dm920'):
-            os.system('echo "Please wait. System installation spakowanego w plik tar.xz w toku..."')
+            os.system('echo "Please wait. System installation Dreambox DM920."')
-            os.system('cp -r ' + getNeoLocation() + 'ImagesUpload/%s.tar.xz  ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz' % source)
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/dm920; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/dm920/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
-            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz; tar -jJxvf ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz -C  ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd) 
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/hd51/rootfs.tar.bz2'):
             os.system('echo "Please wait. System installation AX 4K Box HD51 "')
@@ -1246,10 +1301,6 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             os.system('echo "Please wait. System installation Ferguson Ariva 4K Combo w toku..."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/e2/update; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/e2/update/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd)
-        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/e2/update'):
-            os.system('echo "Please wait. System installation Ferguson Ariva 4K Combo w toku..."')
-            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/dm920; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/dm920/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
-            rc = os.system(cmd) 
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/beyonwiz/v2'):
             os.system('echo "Please wait. System installation beyonwiz v2 4K w toku..."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/beyonwiz/v2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/beyonwiz/v2/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
@@ -1278,6 +1329,44 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             os.system('echo "Please wait. System installation multibox..."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/multibox; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/multibox/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd) 
+
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.xz'):
+            os.system('echo "Please wait. System installation spakowanego w plik tar.xz w toku..."')
+            os.system('cp -r ' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.xz  ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz; tar -jJxvf ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)            
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.gz'):
+            os.system('echo "Please wait. System installation spakowanego w plik tar.gz w toku..."')            
+            os.system('cp -r ' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.gz  ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz; /bin/tar -xzvf ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.bz2'):
+            os.system('echo "Please wait. System installation spakowanego w plik tar.bz2 w toku..."')            
+            os.system('cp -r ' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.bz2  ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.bz2')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.bz2; /bin/tar -xzvf ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/' + source + '.mb'):
+            os.system('echo "Please wait. System installation spakowanego w plik .mb w toku..."')            
+            os.system('cp -r ' + getNeoLocation() + 'ImagesUpload/' + source + '.mb  ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/*.tar.gz; tar -xzvf ' + getNeoLocation() + 'ImagesUpload/*.tar.gz -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/rootfs.bin'):
+            os.chdir('ImagesUpload')
+            os.system('mv -f rootfs.bin rootfs.bin')                    
+            os.system('echo "Instalacja - ubi_reader w toku..."')            
+            print '[NeoBoot] Extracting UBIFS image and moving extracted image to our target'
+            cmd = 'chmod 777 ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py'
+            rc = os.system(cmd)
+            cmd = 'python ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py rootfs.bin -o ' + getNeoLocation() + 'ubi'
+            rc = os.system(cmd)
+            os.chdir('/home/root')
+            cmd = 'cp -r -p ' + getNeoLocation() + 'ubi/rootfs/* ' + getNeoLocation() + 'ImageBoot/' + target
+            rc = os.system(cmd)
+            cmd = 'chmod -R +x ' + getNeoLocation() + 'ImageBoot/' + target
+            rc = os.system(cmd)
+            cmd = 'rm -rf ' + getNeoLocation() + 'ubi'
+            rc = os.system(cmd)
+
         else:
             os.system('echo "NeoBoot wykrył dłąd!!! Prawdopodobnie brak pliku instalacyjnego."')
 

NeoBoot/files/tools.py

@@ -1327,7 +1327,7 @@ class InternalFlash(Screen):
                         os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p4 /media/InternalFlash')  
 
                 if os.path.exists('/proc/stb/info/boxtype'):
-                    if getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7':   
+                    if getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getBoxHostName() == 'zgemmah7' :   
                          os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p3 /media/InternalFlash')
 
                 if os.path.exists('/proc/stb/info/boxtype'):

NeoBoot/files/userscript.sh

@@ -3,19 +3,23 @@
 # here you can add your own command to perform
 # line - Checking internet connection by @j00zek thank you    
 
-if [ ! -e /usr/bin/enigma2_pre_start.sh ] ; then
+IMAGEKATALOG=ImageBoot                
-    /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh                
+
+if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot ] ; then
+        mkdir `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` 
+        /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh  
+        echo "_(_________Start mountpoint location NEOBOOT_________)"          
 fi
 
 echo "_(Checking internet connection)..."
 ping -c 1 github.com 1>/dev/null 2>%1 
 if [ $? -gt 0 ]; then 
-      echo -n "_(github server unavailable, update impossible)!!! \nnetwork restart... "       
+      echo -n "_(github server unavailable, update impossible)\n!!! network restart...!!! )"       
       /etc/init.d/networking stop; 
-	  echo "stopping network connection" 
+	  echo "_____(stopping network connection)_____" 
 	  sleep 1; 
 	  /etc/init.d/networking start; 
-	  echo "start network connection" 	  
+	  echo "_____(start network connection)_____" 	  
 	  sleep 5
 	  
       if [ $? -gt 0 ]; then
@@ -29,24 +33,24 @@ if [ $? -gt 0 ]; then
           fi
           if [ ! -f /tmp/ver.txt ] ; then
               /etc/init.d/networking stop; 
-			  echo "stopping network connection" 
+			  echo "_____(stopping network connection)_____" 
               sleep 2; 
               /etc/init.d/networking start;
-			  echo "start network connection"
+			  echo "_____(start network connection)_____"
 			  
           fi
       fi
 
-      if [ -e ./%1 ] ; then
+      if [ -e /%1 ] ; then
-         rm -f ./%1                
+         rm -f /%1                
       fi
       
 #      echo "        dns-nameservers 1.1.1.1 " >> /etc/network/interfaces     
 else
-    echo "_(github server available)!!!"  
+    echo "_____!!!(github server available)!!!_____"  
 fi
 
-echo "file used userscript "  
+echo "!!!_____([NEOBOOT] used userscript)_____!!! "  
 echo ok 
 
 exit 0 

NeoBoot/plugin.py

@@ -50,8 +50,8 @@ if fileExists('/etc/vtiversion.info') and fileExists('/.multinfo'):
 else:
     from files.neoconsole import Console
     
-PLUGINVERSION = '9.01'
+PLUGINVERSION = '9.02'
-UPDATEVERSION = '9.01'    
+UPDATEVERSION = '9.03'    
 LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot'    
 
 try:
@@ -65,6 +65,17 @@ try:
 except:
     print 'ERROR INSERTING FONT'
        
+def neoTranslator():
+    neolang = ''
+    usedlang = open('/etc/enigma2/settings', 'r')
+    lang = 'config.osd.language=pl_PL'
+    local = usedlang.read().find(lang)
+    if local != -1:
+        neolang = 'islangPL'
+    else:
+        neolang = 'isnotlangPL'
+    return neolang
+
 def getDS():
     s = getDesktop(0).size()
     return (s.width(), s.height())
@@ -530,32 +541,8 @@ class NeoBootInstallation(Screen):
                             os.system('opkg install mtd-utils-ubifs')
 
             # ARM - OctagonSF4008 - DM900 - Zgemma h7S - Octagon sf 8008 - AX HD60 4K  #gbquad4k  arm , #osmio4k  arm, #Zgemma h9  arm, #Zgemma h7S  arm , #Octagon SF4008         
-            if getCPUSoC() or getBoxHostName() or getTunerModel() == ['ax51',              
+            if getBoxHostName() == 'ustym4kpro' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getBoxHostName() == 'zgemmah7' or getBoxHostName() == 'ax51' or getBoxHostName() == 'tmtwin4k' or getBoxHostName() == 'anadol4k' or getBoxHostName() == 'protek4k' or getBoxHostName() == 'maxytecmulti' or getBoxHostName() == 'force3uhd' or getBoxHostName() == 'viper4k' or getBoxHostName() == 'dm920' or getBoxHostName() == 'et1x000' or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' 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' and getBoxHostName() != 'vuultimo4k' and getBoxHostName() != 'vuuno4k' and getBoxHostName() != 'vusolo4k' and getBoxHostName() != 'vuuno4kse' and getBoxHostName() != 'vuultimo4k' and getBoxHostName() != 'vuduo4k' and getBoxHostName() != 'vuzero4k':
-             'dm920', 
+                        os.system('cp -f ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init; mv ' + LinkNeoBoot + '/tmpfiles/runpy/arm_run.py ' + LinkNeoBoot + '/run.py; cd')                                                                          
-             'et1x000', 
-             'bcm7251', 
-             'sf4008', 
-             'bcm7251s', 
-             'h7', 
-             'h9combo',
-             'zgemmah9s',              
-             'h10',              
-             'bcm7252s', 
-             'gbquad4k', 
-             'osmio4k',  
-             'ax60', 
-             'sf8008', 
-             'bcm7251',  
-             'BCM97252SSFF', 
-             'dm900',
-             'tmtwin4k',              
-             'anadol4k', 
-             'protek4k', 
-             'maxytecmulti',
-             'force3uhd',          
-             'viper4k']:             
-                 os.system('cp -f ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init; mv ' + LinkNeoBoot + '/tmpfiles/runpy/arm_run.py ' + LinkNeoBoot + '/run.py; cd')                         
-                                                 
             #VUPLUS ARM 
             elif getCPUtype() == 'ARMv7' and getBoxHostName() !=  'ustym4kpro':
                 if getCPUSoC() == '7278' or getBoxHostName() == 'vuduo4k':
@@ -572,18 +559,6 @@ class NeoBootInstallation(Screen):
                         os.system('dd if=/dev/mmcblk0p4 of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName()))      
                         os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/vuZero4Kmmcblk0p4.sh ' + LinkNeoBoot + '/files/kernel.sh; mv ' + LinkNeoBoot + '/tmpfiles/runpy/zero4k_run.py ' + LinkNeoBoot + '/run.py; cd')                         
                                                                                                                                                                                                                                                                                                                                                                                            
-                #Zgemma h7S  arm  
-                elif getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7':                        
-                        os.system('opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade kernel-image;cp -f /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; dd if=/dev/kernel of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName()) )  
-                        if fileExists('/tmp/findkerneldevice.py'):  
-                            os.sytem('cp -fr /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; ')                                                                                                                                                                                                                                                                                                                                                                                      
-                        else:
-                            os.sytem('mv ' + LinkNeoBoot + '/tmpfiles/runpy/findustym.py ' + LinkNeoBoot + '/files/findkerneldevice.py')
-                        os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm') 
-                        os.system('chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init')                             
-                        os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; cd')                 
-                        os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/h7s_kernel.sh ' + LinkNeoBoot + '/files/kernel.sh; mv /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/tmpfiles/runpy/target/h7s_run.py /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/run.py; cd')                         
-
                 elif getCPUSoC() or getBoxHostName() == ['7444s', 
                  '7252s',
                  '7376',
@@ -597,20 +572,31 @@ class NeoBootInstallation(Screen):
                         os.system('dd if=/dev/mmcblk0p1 of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName()) )
                         os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/vu_mmcblk0p1.sh ' + LinkNeoBoot + '/files/kernel.sh; mv ' + LinkNeoBoot + '/tmpfiles/runpy/vu4k_run.py ' + LinkNeoBoot + '/run.py; cd')                         
                                                                                           
-            # ARM - ustym4kpro                                                                    
+                #Zgemma h7S  arm  - no testet
-            # ARM - ustym4kpro                                                                    
+#                elif getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getBoxHostName() == 'zgemmah7':                        
-            elif getBoxHostName() == 'ustym4kpro':
+#                        os.system('opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade kernel-image;cp -f /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; dd if=/dev/kernel of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName()) )  
-                        os.system('opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade kernel-image;cp -f /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; dd if=/dev/kernel of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName()) )  
+#                        if fileExists('/tmp/findkerneldevice.py'):  
-                        if fileExists('/tmp/findkerneldevice.py'):  
+#                            os.sytem('cp -fr /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; ')                                                                                                                                                                                                                                                                                                                                                                                      
-                            os.sytem('cp -fr /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; ')                                                                                                                                                                                                                                                                                                                                                                                      
+#                        else:
-                        else:
+#                            os.sytem('mv ' + LinkNeoBoot + '/tmpfiles/runpy/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py')
-                            os.sytem('mv ' + LinkNeoBoot + '/tmpfiles/runpy/findustym.py ' + LinkNeoBoot + '/files/findkerneldevice.py')
+#                        os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm') 
-                        os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm') 
+#                        os.system('chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init')                             
-                        os.system('chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init')                             
+#                        os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; cd')                 
-                        os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; cd')                 
+#                        os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/h7s_kernel.sh ' + LinkNeoBoot + '/files/kernel.sh; mv /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/tmpfiles/runpy/target/h7s_run.py /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/run.py; cd')                         
-                        os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/ustym4kpro.sh ' + LinkNeoBoot + '/files/kernel.sh; mv /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/tmpfiles/runpy/target/ustym4kpro.py /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/run.py; cd')                         
 
 
+            # ARM - ustym4kpro                                                                    
+#            elif getBoxHostName() == 'ustym4kpro' and getCPUSoC() == '3798mv200':
+#                        os.system('opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade kernel-image;cp -f /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; dd if=/dev/kernel of=%sImagesUpload/.kernel/flash-kernel-%s.bin' % (getNeoLocation(), getBoxHostName()) )  
+#                        if fileExists('/tmp/findkerneldevice.py'):  
+#                            os.sytem('cp -fr /tmp/findkerneldevice.py ' + LinkNeoBoot + '/files/findkerneldevice.py; ')                                                                                                                                                                                                                                                                                                                                                                                      
+#                        else:
+#                            os.sytem('mv ' + LinkNeoBoot + '/tmpfiles/runpy/findustym.py ' + LinkNeoBoot + '/files/findkerneldevice.py')
+#                        os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm') 
+#                        os.system('chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init')                             
+#                        os.system('cp -Rf ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; cd')                 
+#                        os.system('mv ' + LinkNeoBoot + '/tmpfiles/target/ustym4kpro.sh ' + LinkNeoBoot + '/files/kernel.sh; mv /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/tmpfiles/runpy/target/ustym4kpro.py /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/run.py; cd')                         
+
             # MIPS                                                                                                                                                                                                                 
             elif getCPUtype() == 'MIPS':
                 if getCPUSoC() or getBoxHostName() or getTunerModel() == ['7335', 
@@ -1005,21 +991,28 @@ class NeoBootImageChoose(Screen):
         if yesno:
             if fileExists('/tmp/*.zip'):
                 os.system('rm /tmp/*.zip')
-            os.system('cd /tmp; curl -O --ftp-ssl https://codeload.github.com/gutosie/NeoBoot-9/zip/master; mv /tmp/master /tmp/neoboot.zip; cd /')
+            os.system('sync; cd /tmp; curl -O --ftp-ssl https://codeload.github.com/gutosie/NeoBoot-9/zip/master; mv /tmp/master /tmp/neoboot.zip; cd /')
             if not fileExists('/tmp/neoboot.zip'):
                     os.system('cd /tmp;fullwget --no-check-certificate https://codeload.github.com/gutosie/NeoBoot-9/zip/master; mv /tmp/master /tmp/neoboot.zip; sleep 3;cd ')
                     if not fileExists('/tmp/neoboot.zip'):
                         self.session.open(MessageBox, _('Unfortunately, at the moment not found an update, try again later.'), MessageBox.TYPE_INFO, 8)
+                    else:
+                        self.goUpdateNEO()
             else:
+                self.goUpdateNEO()
+        else:
+            os.system('rm -f ' + LinkNeoBoot + '/ver.txt')
+            self.session.open(MessageBox, _('The update has been canceled.'), MessageBox.TYPE_INFO, 8)
+
+    def goUpdateNEO(self):   
+                if fileExists('' + LinkNeoBoot + '/wget-log'):
+                        os.system('rm ' + LinkNeoBoot + '/wget-log')                                                                                                                                                                                                                                                                                                                                                    
                 os.system('cd /tmp/; unzip -qn ./neoboot.zip; rm -f ./neoboot.zip; cp -rf ./NeoBoot-9-master/NeoBoot /usr/lib/enigma2/python/Plugins/Extensions; rm -rf /tmp/NeoBoot-9-master;  rm ' + LinkNeoBoot + '/ver.txt; cd ' + LinkNeoBoot + '/; chmod 0755 ./bin/neoini*;  chmod 0755 ./ex_init.py; chmod 0755 ./tmpfiles/target/*; chmod 0755 ./files/NeoBoot.sh; chmod 0755 ./files/userscript.sh; cd')                    
                 if getCPUtype() == 'MIPS':
                     os.system('cd ' + LinkNeoBoot + '/; cp -rf ./bin/neoinitmipsvu /sbin; chmod 755 /sbin/neoinitmipsvu; cp -rf ./bin/neoinitmips /sbin; chmod 755 /sbin/neoinitmips; cd')                                                                                  
                 os.system('cd ' + LinkNeoBoot + '/; rm ./bin/install; rm ./files/mountpoint.sh; rm ./files/neo.sh')
                 restartbox = self.session.openWithCallback(self.restartGUI, MessageBox, _('Completed update NeoBoot. You need to restart the E2 !!!\nRestart now ?'), MessageBox.TYPE_YESNO)
                 restartbox.setTitle(_('Restart GUI now ?'))
-        else:
-            os.system('rm -f ' + LinkNeoBoot + '/ver.txt')
-            self.session.open(MessageBox, _('The update has been canceled.'), MessageBox.TYPE_INFO, 8)
 
     def restartGUI(self, answer):		
         if answer is True:
@@ -1419,7 +1412,7 @@ def checkInternet():
 
 def checkimage():
     mycheck = False
-    if not fileExists('/proc/stb/info') or not fileExists('' + LinkNeoBoot + '/neoskins/neo/neo_skin.py') or not fileExists('' + LinkNeoBoot + '/bin/neoinitarm'): 
+    if not fileExists('/proc/stb/info') or not fileExists('' + LinkNeoBoot + '/neoskins/neo/neo_skin.py') or not fileExists('' + LinkNeoBoot + '/bin/utilsbh') or not fileExists('' + LinkNeoBoot + '/stbinfo'): 
         mycheck = False
     else:
         mycheck = True

NeoBoot/stbinfo

@@ -1,78 +0,0 @@
-#!/bin/sh
-#Wspierane tunery satelitarne:
-#Machine BCM - getCPUSoC(): 
-
-cat /proc/stb/info/chipset:  
-cat /proc/stb/info/chipset
-cat /etc/hostname
-cat /proc/cpuinfo
-cat /proc/version
-cat /etc/issue
-cat /proc/mtd
-mtd_debug info /dev/mtd0
-cat /proc/cmdline
-cat /proc/partitions
-cat /var/lib/opkg/info/kernel-image*.postinst
-
-
-Ultimo4k            :    7444s 
-Solo4k              :    7376  
-Zero 4K             :    72604  
-Duo4k               :    7278  #BCM7278 
-Uno4K               :    7252s 
-Uno4kSE             :    7252s  
-Ultimo              :    7405(with 3D) 
-Uno                 :    7405(with 3D) 
-Duo                 :    7335 
-Duo2                :    7424    
-Zero                :    7362                 
-Solo                :    7325
-Solose              :    7241 
-Solose-v2           :    7241 
-Solo2               :    7356  
-              
-Formuler F1         :    bcm7356    
-Formuler F3         :    7362       
-     
-Miraclebox MBmini   :    bcm7358    
-Miraclebox Micro    :    bcm7362     
-Miraclebox Ultra    :    bcm7424                             
-  
-Octagon Sf8008      :    3798mv200
-Octagon SF4008      :    bcm7251
-
-Zgemma h7S          :    bcm7251s 
-Zgemma H9S          :    hi3798mv200 hostname: zgemmah9s; mtd6: 01000000 00020000 "kernel" ;    mtd7: 0ea00000 00020000 "rootfs"      
-
-AX HD60 4K          :    hi3798mv200 # cat /etc/hostname : ax60
-
-OSmini              :    BCM7362
-
-atemio6000          :    bcm7362   
-
-gbquad4k            :    bcm7252s    # cat /proc/stb/info/model : gbquad4k #  # cat /etc/hostname : gbquad4k # cat /proc/cmdline root=/dev/mmcblk0p5 rootwait rw rootflags=data=journal libata.force=1:3.0G,2:3.0G,3:3.0G coherent_poll=2M vmalloc=525m bmem=529m@491m bmem=608m@2464m
-
-ustym4kpro: cat /proc/stb/info/chipset 3798mv200 root@ustym4kpro: cat /etc/hostname ustym4kpro
-
-GI ET-11000 4K      :    bcm7251     #cat /etc/hostname et1x000     #Galaxy Innvations ET-11000
-
-AX HD51 4K          :    bcm7251s    # cat /etc/hostname : ax51     # cat /proc/stb/info/boxtype : hd51
-
-viper4k
-osmio4k 
-ax60
-sf8008 
-sf4008
-et1x000
-dm920 
-ax51     
-gbquad4k             
-ustym4kpro                                       
-dm900 
-tmtwin4k 
-anadol4k 
-protek4k 
-maxytecmulti
-force3uhd 
-             
-             

NeoBoot/unpack.py

@@ -108,6 +108,14 @@ class InstallImage(Screen, ConfigListScreen):
                 fn = fn.replace('.tar.xz', '')
                 sourcelist.append((fn, fn))
                 continue
+            if fn.find('.tar.gz') != -1:
+                fn = fn.replace('.tar.gz', '')
+                sourcelist.append((fn, fn))
+                continue   
+            if fn.find('.mb') != -1:
+                fn = fn.replace('.mb', '')
+                sourcelist.append((fn, fn))
+                continue                               
             if fn.find('.nfi') != -1:
                 fn = fn.replace('.nfi', '')
                 sourcelist.append((fn, fn))
@@ -120,6 +128,7 @@ class InstallImage(Screen, ConfigListScreen):
         self.CopyFiles = ConfigYesNo(default=True)
         self.CopyKernel = ConfigYesNo(default=True)       
         self.TvList = ConfigYesNo(default=False) 
+        self.LanWlan = ConfigYesNo(default=False)        
         self.Sterowniki = ConfigYesNo(default=False)                                                
         self.InstallSettings = ConfigYesNo(default=False)        
         self.ZipDelete = ConfigYesNo(default=False)                 
@@ -162,6 +171,7 @@ class InstallImage(Screen, ConfigListScreen):
         self.list.append(getConfigListEntry(_('Copy files from Flash to the installed image ?'), self.CopyFiles ))         
         self.list.append(getConfigListEntry(_('Copy the kernel of the installed system (recommended ?'), self.CopyKernel ))         
         self.list.append(getConfigListEntry(_('Copy the channel list ?'), self.TvList))   
+        self.list.append(getConfigListEntry(_('Copy network settings LAN-WLAN ?'), self.LanWlan))               
         self.list.append(getConfigListEntry(_('Copy the drivers ? (Recommended only other image.)'), self.Sterowniki))                                                                
         self.list.append(getConfigListEntry(_('Copy Settings to the new Image'), self.InstallSettings))                                                                                
         self.list.append(getConfigListEntry(_('Delete Image zip after Install ?'), self.ZipDelete)) 
@@ -228,13 +238,14 @@ class InstallImage(Screen, ConfigListScreen):
                 message += _('Please, wait...\n')                
                 message += "'"
                 cmd1 = 'python ' + pluginpath + '/ex_init.py'
-                cmd = '%s %s %s %s %s %s %s %s %s %s %s %s %s %s ' % (cmd1,
+                cmd = '%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s ' % (cmd1,
                  source,
                  target.replace(' ', '.'),
                  str(self.stopenigma.value),                  
                  str(self.CopyFiles.value),                 
                  str(self.CopyKernel.value),                 
                  str(self.TvList.value),  
+                 str(self.LanWlan.value),                               
                  str(self.Sterowniki.value),                                                                                                                        
                  str(self.InstallSettings.value), 
                  str(self.ZipDelete.value),                                                                    

ver.txt

@@ -1,2 +1,2 @@
-9.01
+9.04