From df4035a25082d2928c07166234755a2c456582ec Mon Sep 17 00:00:00 2001 From: gutosie Date: Sun, 19 Jan 2020 20:56:14 +0200 Subject: [PATCH] 8.16 --- NeoBoot/extract.py | 13 ++++++------ NeoBoot/plugin.py | 52 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py index 6553bed..571887b 100644 --- a/NeoBoot/extract.py +++ b/NeoBoot/extract.py @@ -445,7 +445,8 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon rc = os.system(cmd) cmd = 'echo "exit 0" >> %s/ImageBoot/%s/etc/init.d/bootmisc.sh' % (media, target) rc = os.system(cmd) - + cmd = 'chmod 755 %s/ImageBoot/%s/etc/init.d/bootmisc.sh' % (media, target) + rc = os.system(cmd) namefile = media + '/ImageBoot/' + target + '/etc/fstab' namefile2 = namefile + '.tmp' @@ -638,9 +639,9 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon if os.path.exists('' + getNeoLocation() + 'ubi'): os.system('rm -r ' + getNeoLocation() + 'ubi') if os.path.exists('' + getNeoLocation() + 'image_cache/'): - os.system('rm -r' + getNeoLocation() + 'image_cache') + os.system('rm -r ' + getNeoLocation() + 'image_cache') if os.path.exists('' + getNeoLocation() + 'ImageBoot/.without_copying'): - os.system('rm -r' + getNeoLocation() + 'ImageBoot/.without_copying') + os.system('rm -f ' + getNeoLocation() + 'ImageBoot/.without_copying') rc = RemoveUnpackDirs() if os.path.exists('/tmp/init4'): @@ -724,19 +725,19 @@ 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/uclan'): + elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/gigablue'): rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/usb_update.bin ' + getNeoLocation() + 'ImagesUpload/gigablue') rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/apploader.bin ' + getNeoLocation() + 'ImagesUpload/gigablue') 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/uclan') + rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/gigablue') def NEOBootExtract(source, target, ZipDelete, BlackHole): RemoveUnpackDirs() os.system('echo "Installation started:"; date +%T;echo "Extracting the installation file..."') if os.path.exists('' + getNeoLocation() + 'ImageBoot/.without_copying'): - os.system('rm ' + getNeoLocation() + 'ImageBoot/.without_copying') + os.system('rm -f ' + getNeoLocation() + 'ImageBoot/.without_copying') if os.path.exists('' + getNeoLocation() + 'image_cache'): os.system('rm -rf ' + getNeoLocation() + 'image_cache') diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py index 7f5f259..7c877e7 100644 --- a/NeoBoot/plugin.py +++ b/NeoBoot/plugin.py @@ -49,7 +49,7 @@ LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' # warranty, use at YOUR own risk. PLUGINVERSION = '8.00' -UPDATEVERSION = '8.15' +UPDATEVERSION = '8.16' def Freespace(dev): statdev = os.statvfs(dev) @@ -632,7 +632,53 @@ 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""" @@ -1353,7 +1399,7 @@ def checkimage(): return mycheck def main(session, **kwargs): - if not fileExists('' + LinkNeoBoot + '/files/mountpoint.sh'): + if not fileExists('' + LinkNeoBoot + '/files/neo.sh'): pass else: if not fileExists('%sImageBoot/.version' % getNeoLocation()):