From 6032c92df8b336794d887bd2d9714eecba7e76b9 Mon Sep 17 00:00:00 2001 From: gutosie Date: Mon, 1 Mar 2021 10:52:46 +0200 Subject: [PATCH] Add files via upload --- NeoBoot/tmpfiles/runpy/arm_run.py | 2 +- NeoBoot/tmpfiles/runpy/duo4k_run.py | 7 ++----- NeoBoot/tmpfiles/runpy/duo4kse_run.py | 7 ++----- NeoBoot/tmpfiles/runpy/vu4k_run.py | 9 +++------ NeoBoot/tmpfiles/runpy/zero4k_run.py | 11 ++++------- 5 files changed, 12 insertions(+), 24 deletions(-) diff --git a/NeoBoot/tmpfiles/runpy/arm_run.py b/NeoBoot/tmpfiles/runpy/arm_run.py index f7fb5e0..6782ccb 100644 --- a/NeoBoot/tmpfiles/runpy/arm_run.py +++ b/NeoBoot/tmpfiles/runpy/arm_run.py @@ -25,7 +25,7 @@ from Components.Pixmap import Pixmap, MultiPixmap from Components.config import * from Components.ConfigList import ConfigListScreen from Tools.LoadPixmap import LoadPixmap -from Tools.Directories import fileCheck, fileExists, pathExists, createDir, resolveFilename, SCOPE_PLUGINS +from Tools.Directories import fileExists, pathExists, createDir, resolveFilename, SCOPE_PLUGINS from os import system, listdir, mkdir, chdir, getcwd, rename as os_rename, remove as os_remove, popen from os.path import dirname, isdir, isdir as os_isdir import os diff --git a/NeoBoot/tmpfiles/runpy/duo4k_run.py b/NeoBoot/tmpfiles/runpy/duo4k_run.py index 3883909..61e0ef6 100644 --- a/NeoBoot/tmpfiles/runpy/duo4k_run.py +++ b/NeoBoot/tmpfiles/runpy/duo4k_run.py @@ -10,6 +10,7 @@ from Screens.MessageBox import MessageBox from Screens.ChoiceBox import ChoiceBox from Screens.VirtualKeyBoard import VirtualKeyBoard from Screens.Standby import TryQuitMainloop +from Screens.Console import Console from Components.About import about from Components.Sources.List import List from Components.Button import Button @@ -24,15 +25,11 @@ from Components.Pixmap import Pixmap, MultiPixmap from Components.config import * from Components.ConfigList import ConfigListScreen from Tools.LoadPixmap import LoadPixmap -from Tools.Directories import fileCheck, fileExists, pathExists, createDir, resolveFilename, SCOPE_PLUGINS +from Tools.Directories import fileExists, pathExists, createDir, resolveFilename, SCOPE_PLUGINS from os import system, listdir, mkdir, chdir, getcwd, rename as os_rename, remove as os_remove, popen from os.path import dirname, isdir, isdir as os_isdir import os import time -if fileCheck('/etc/vtiversion.info') or fileExists('/usr/lib/python3.8'): - from Screens.Console import Console -elif not fileCheck('/etc/vtiversion.info'): - from Plugins.Extensions.NeoBoot.files.neoconsole import Console LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' diff --git a/NeoBoot/tmpfiles/runpy/duo4kse_run.py b/NeoBoot/tmpfiles/runpy/duo4kse_run.py index 3a2672a..f07d931 100644 --- a/NeoBoot/tmpfiles/runpy/duo4kse_run.py +++ b/NeoBoot/tmpfiles/runpy/duo4kse_run.py @@ -10,6 +10,7 @@ from Screens.MessageBox import MessageBox from Screens.ChoiceBox import ChoiceBox from Screens.VirtualKeyBoard import VirtualKeyBoard from Screens.Standby import TryQuitMainloop +from Screens.Console import Console from Components.About import about from Components.Sources.List import List from Components.Button import Button @@ -24,15 +25,11 @@ from Components.Pixmap import Pixmap, MultiPixmap from Components.config import * from Components.ConfigList import ConfigListScreen from Tools.LoadPixmap import LoadPixmap -from Tools.Directories import fileCheck, fileExists, pathExists, createDir, resolveFilename, SCOPE_PLUGINS +from Tools.Directories import fileExists, pathExists, createDir, resolveFilename, SCOPE_PLUGINS from os import system, listdir, mkdir, chdir, getcwd, rename as os_rename, remove as os_remove, popen from os.path import dirname, isdir, isdir as os_isdir import os import time -if fileCheck('/etc/vtiversion.info') or fileExists('/usr/lib/python3.8'): - from Screens.Console import Console -elif not fileCheck('/etc/vtiversion.info'): - from Plugins.Extensions.NeoBoot.files.neoconsole import Console LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' diff --git a/NeoBoot/tmpfiles/runpy/vu4k_run.py b/NeoBoot/tmpfiles/runpy/vu4k_run.py index cb96e92..b60a8bc 100644 --- a/NeoBoot/tmpfiles/runpy/vu4k_run.py +++ b/NeoBoot/tmpfiles/runpy/vu4k_run.py @@ -11,6 +11,7 @@ from Screens.MessageBox import MessageBox from Screens.ChoiceBox import ChoiceBox from Screens.VirtualKeyBoard import VirtualKeyBoard from Screens.Standby import TryQuitMainloop +from Screens.Console import Console from Components.About import about from Components.Sources.List import List from Components.Button import Button @@ -25,15 +26,11 @@ from Components.Pixmap import Pixmap, MultiPixmap from Components.config import * from Components.ConfigList import ConfigListScreen from Tools.LoadPixmap import LoadPixmap -from Tools.Directories import fileCheck, fileExists, pathExists, createDir, resolveFilename, SCOPE_PLUGINS +from Tools.Directories import fileExists, pathExists, createDir, resolveFilename, SCOPE_PLUGINS from os import system, listdir, mkdir, chdir, getcwd, rename as os_rename, remove as os_remove, popen from os.path import dirname, isdir, isdir as os_isdir import os -import time -if fileCheck('/etc/vtiversion.info') or fileExists('/usr/lib/python3.8'): - from Screens.Console import Console -elif not fileCheck('/etc/vtiversion.info'): - from Plugins.Extensions.NeoBoot.files.neoconsole import Console +import time LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' class StartImage(Screen): diff --git a/NeoBoot/tmpfiles/runpy/zero4k_run.py b/NeoBoot/tmpfiles/runpy/zero4k_run.py index 29478eb..d2a9b59 100644 --- a/NeoBoot/tmpfiles/runpy/zero4k_run.py +++ b/NeoBoot/tmpfiles/runpy/zero4k_run.py @@ -9,6 +9,7 @@ from Screens.MessageBox import MessageBox from Screens.ChoiceBox import ChoiceBox from Screens.VirtualKeyBoard import VirtualKeyBoard from Screens.Standby import TryQuitMainloop +from Screens.Console import Console from Components.About import about from Components.Sources.List import List from Components.Button import Button @@ -23,16 +24,12 @@ from Components.Pixmap import Pixmap, MultiPixmap from Components.config import * from Components.ConfigList import ConfigListScreen from Tools.LoadPixmap import LoadPixmap -from Tools.Directories import fileCheck, fileExists, pathExists, createDir, resolveFilename, SCOPE_PLUGINS +from Tools.Directories import fileExists, pathExists, createDir, resolveFilename, SCOPE_PLUGINS from os import system, listdir, mkdir, chdir, getcwd, rename as os_rename, remove as os_remove, popen from os.path import dirname, isdir, isdir as os_isdir import os -import time -if fileCheck('/etc/vtiversion.info') or fileExists('/usr/lib/python3.8'): - from Screens.Console import Console -elif not fileCheck('/etc/vtiversion.info'): - from Plugins.Extensions.NeoBoot.files.neoconsole import Console -LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' +import time +LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' class StartImage(Screen):