Merge pull request 'ogfunctions-ret-none' (#97) from ogfunctions-ret-none into main

Reviewed-on: #97

CHANGELOG.md

@@ -5,6 +5,54 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.30.1] - 2025-07-17
+
+### Changed
+
+- Have wrappers fail if functions return None
+
+## [0.30.0] - 2025-07-17
+
+### Added
+
+- Add script for getting data out of deployed git images
+
+## [0.29.0] - 2025-07-17
+
+### Changed
+
+- Now Configurar.py takes a third parameter: whether just check stuff or not
+
+## [0.28.0] - 2025-07-17
+
+### Changed
+
+- Use python init scripts by default
+
+## [0.27.0] - 2025-07-16
+
+### Added
+
+- Add python init scripts
+
+## [0.26.1] - 2025-07-14
+
+### Changed
+
+- Change sort order in `_getAllDisks()`
+
+## [0.26.0] - 2025-07-14
+
+### Fixed
+
+- Overhaul partitioning
+
+## [0.25.2] - 2025-07-14
+
+### Fixed
+
+- Run initCache.py rather than just initCache
+
 ## [0.25.1] - 2025-07-11
 
 ### Changed

ogclient/etc/init.py

@@ -0,0 +1,49 @@
+#!/usr/bin/python3
+# Proceso general de arranque de OpenGnsys Client.
+
+import os
+import re
+import subprocess
+
+import ogGlobals
+from NetLib import ogGetIpAddress
+
+ogstatus      = os.environ.get ('ogstatus', '')
+ogcore        = os.environ.get ('ogcore', '')
+oglog         = os.environ.get ('oglog', '')
+oggroup       = os.environ.get ('OGGROUP', '')
+ogactiveadmin = os.environ.get ('ogactiveadmin', '')
+LANG          = os.environ.get ('LANG', 'es_ES')
+LANG = LANG[0:LANG.index('_')]
+
+LOGLEVEL=5
+
+# Matando plymount para inicir browser o shell
+subprocess.run (['pkill', '-9', 'plymouthd'])
+
+# Arranque de OpenGnsys Client daemon (socket).
+print (ogGlobals.lang.MSG_LAUNCHCLIENT)
+# Indicar fichero de teclado de Qt para el idioma especificado (tipo "es.qmap").
+if os.path.exists (f'/usr/local/etc/{LANG}.qmap'):
+    os.environ['QWS_KEYBOARD'] = f'TTY:keymap=/usr/local/etc/{LANG}.qmap'
+
+if os.path.exists ('/usr/share/OGAgent/opengnsys/linux/OGAgentService.py') and ogstatus != 'offline':
+    os.chdir ('/usr/share/OGAgent')
+    os.environ['OGAGENTCFG_OGCORE_IP']      = ogcore
+    os.environ['OGAGENTCFG_OGLOG_IP']       = oglog
+    os.environ['OGAGENTCFG_URLMENU_SCHEME'] = 'http'
+    os.environ['OGAGENTCFG_URLMENU_IP']     = '127.0.0.1'
+    os.environ['OGAGENTCFG_URLMENU_PORT']   = '81'
+    subprocess.run (['python3', '-m', 'opengnsys.linux.OGAgentService', 'fg'])
+else:
+    ip = ogGetIpAddress()
+    OGMENU = ''
+    for FILE in [index, oggroup, ip]:
+        if not FILE: continue
+        m = f'{ogGlobals.OGCAC}/menus/{FILE}.html'
+        if os.path.exists (m): OGMENU = m
+    subprocess.run ([f'{ogGlobals.OPENGNSYS}/bin/launch_browser', m])
+
+# Si fallo en cliente y modo "admin", cargar shell; si no, salir.
+if ogactiveadmin == 'true':
+    subprocess.run (['bash'])

ogclient/etc/preinit.py

@@ -0,0 +1,43 @@
+#!/usr/bin/python3
+
+## early init
+import os
+import sys
+OPENGNSYS = os.environ.get ('OPENGNSYS', '/opt/opengnsys')
+os.environ['PYTHONPATH'] = f'{OPENGNSYS}/lib/python3'
+sys.path.insert (0, os.environ['PYTHONPATH'])
+## end
+
+import subprocess
+
+import ogGlobals
+from InitLib import loadenviron, write_profile, clean_esp, fileslinks, loadmodules, metadevs, mountrepo, poweroff, filebeat, stunnel, dbus, otherservices, runhttplog
+
+IPV4ADDR = os.environ.get ('IPV4ADDR', '')
+OG_IP    = os.environ.get ('OG_IP', '')
+
+loadenviron()
+write_profile()
+
+# Funciones de inicio.
+clean_esp()
+fileslinks()
+loadmodules()
+metadevs()
+mountrepo()
+poweroff()
+filebeat()
+stunnel()
+dbus()
+otherservices()
+runhttplog()
+
+if IPV4ADDR and os.path.exists (f'{ogGlobals.OGETC}/init/{IPV4ADDR}.sh'):
+    if OG_IP: subprocess.run ([f'{ogGlobals.OGETC}/init/{OG_IP}.sh'])
+
+elif os.path.exists (f'{ogGlobals.OGETC}/init.py'):
+    subprocess.run ([f'{ogGlobals.OGETC}/init.py'])
+
+else:
+    print ('No se ha encontrado script de inicio')
+    subprocess.run (['halt'])

ogclient/etc/preinit/default.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+if grep -q pyinit=false /proc/cmdline; then
+    echo "shell init"
+else
+    echo "python init"
+    exec /opt/opengnsys/etc/preinit.py
+fi
+
 # Cargar entorno de OpenGnsys
 set -a
 source /opt/opengnsys/etc/preinit/loadenviron.sh

ogclient/functions/ogAddCmd

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogAddCmd (args.disk, args.par, args.cmdfile, args.cmd)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogAddRegistryKey

@@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogAddRegistryKey (args.mntpt, args.hive, args.k)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogAddRegistryValue

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogAddRegistryValue (args.mntpt, args.hive, args.k, args.vtype)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogBoot

@@ -39,6 +39,7 @@ elif 4 == len (sys.argv):
 elif 5 == len (sys.argv):
     ret = ogBoot (args.disk, args.par, not not args.nvramperm, args.params)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogBootLoaderDefaultEntry

@@ -20,6 +20,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogBootLoaderDefaultEntry (args.disk, args.par, args.diskdefault, args.pardefault)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogBootLoaderDeleteEntry

@@ -20,6 +20,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogBootLoaderDeleteEntry (args.disk, args.par, args.diskdel, args.pardel)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogBootLoaderHidePartitions

@@ -27,6 +27,7 @@ if 3  == len (sys.argv):
 elif 5  == len (sys.argv):
     ret = ogBootLoaderHidePartitions (args.disk, args.par, args.datadisk, args.datapar)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogBootLoaderOgliveDefaultEntry

@@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogBootLoaderOgliveDefaultEntry (args.disk, args.par)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogBootLoaderSetTimeOut

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogBootLoaderSetTimeOut (args.disk, args.par, args.timeout)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogBootMbrGeneric

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogBootMbrGeneric (args.disk)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogBootMbrXP

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogBootMbrXP (args.disk)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCalculateChecksum

@@ -26,6 +26,7 @@ if 3 == len (sys.argv):
 elif 4 == len (sys.argv):
     ret = ogCalculateChecksum (container=f'{args.disk} {args.par}', file=args.file)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCalculateFullChecksum

@@ -26,6 +26,7 @@ if 3 == len (sys.argv):
 elif 4 == len (sys.argv):
     ret = ogCalculateFullChecksum (container=f'{args.disk} {args.par}', file=args.file)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogChangeRepo

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogChangeRepo (args.ip_repo)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCheckFs

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogCheckFs (args.disk, args.par)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCheckIpAddress

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogCheckIpAddress (args.ip)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCleanLinuxDevices

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogCleanLinuxDevices (args.disk, args.par)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCleanOs

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogCleanOs (args.disk, args.par)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogConfigureFstab

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogConfigureFstab (args.disk, args.par)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogConfigureOgagent

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogConfigureOgagent (args.disk, args.par)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCopyEfiBootLoader

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogCopyEfiBootLoader (args.disk, args.par)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCopyFile

@@ -86,6 +86,7 @@ else:
     sys.exit (1)
 
 ret = ogCopyFile (src, dst)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCreateCache

@@ -30,6 +30,7 @@ elif 3 == len (sys.argv):
 elif 4 == len (sys.argv):
     ret = ogCreateCache (ndsk=int(args.disk), part=int(args.part), sizecache=int(args.sizecache))
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCreateGptPartitions

@@ -1,23 +0,0 @@
-#!/usr/bin/python3
-
-import sys
-import argparse
-from SystemLib import ogHelp
-from DiskLib import ogCreateGptPartitions
-
-if 2 == len (sys.argv) and 'help' == sys.argv[1]:
-    #parser.print_help() sale en inglés aunque la locale indique otra cosa
-    ogHelp ('ogCreateGptPartitions', 'ogCreateGptPartitions int_ndisk str_parttype:int_partsize ...', ['ogCreateGptPartitions 1 NTFS:10000000 EXT3:5000000 LINUX-SWAP:1000000'])
-    sys.exit (0)
-
-parser = argparse.ArgumentParser (add_help=False)
-parser.add_argument ('disk')
-parser.add_argument ('parts', nargs='+')
-args = parser.parse_args()
-
-ret = ogCreateGptPartitions (args.disk, args.parts)
-
-if ret is not None:
-    if   ret == True: sys.exit (0)
-    elif ret == False: sys.exit (1)
-    else: print (ret)

ogclient/functions/ogCreateImage

@@ -31,6 +31,7 @@ if 5 == len (sys.argv):
 elif 7 == len (sys.argv):
     ret = ogCreateImage (args.disk, args.par, args.container, args.imgfile, args.tool, args.level)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCreateImageSyntax

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogCreateImageSyntax (args.dev, args.imgfile, args.tool, args.level)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCreatePartitionTable

@@ -24,6 +24,7 @@ if 2 == len (sys.argv):
 elif 3 == len (sys.argv):
     ret = ogCreatePartitionTable (args.disk, args.createptt)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCreatePartitions

@@ -17,6 +17,7 @@ args = parser.parse_args()
 
 ret = ogCreatePartitions (args.disk, args.parts)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogCreateTorrent

@@ -25,6 +25,8 @@ if 4 == len (sys.argv):
     ret = ogCreateTorrent (container=args.container, file=args.file, ip_bttrack=args.ip_bttrack)
 elif 5 == len (sys.argv):
     ret = ogCreateTorrent (disk=args.disk, par=args.par, file=args.file, ip_bttrack=args.ip_bttrack)
+
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogDeleteCache

@@ -7,6 +7,7 @@ from CacheLib import ogDeleteCache
 
 ret = ogDeleteCache()
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogDeleteFile

@@ -26,6 +26,7 @@ if 3 == len (sys.argv):
 elif 4 == len (sys.argv):
     ret = ogDeleteFile (container=f'{args.disk} {args.par}', file=args.file)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogDeletePartitionTable

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogDeletePartitionTable (args.disk)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogDeleteRegistryKey

@@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogDeleteRegistryKey (args.mntpt, args.hive, args.k)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogDeleteRegistryValue

@@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogDeleteRegistryValue (args.mntpt, args.hive, args.k)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogDeleteTree

@@ -26,6 +26,7 @@ if 3 == len (sys.argv):
 elif 4 == len (sys.argv):
     ret = ogDeleteTree (container=f'{args.disk} {args.par}', file=args.file)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogDevToDisk

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogDevToDisk (args.arg_dev)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogDiskToDev

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogDiskToDev (args.arg_disk, args.arg_part)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogEcho

@@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogEcho (args.logtypes, args.loglevel, args.msg)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogExecAndLog

@@ -48,6 +48,7 @@ for arg in sys.argv[1:]:
 args = tuple (args)
 
 ret = ogExecAndLog (logtypes, fun, *args, **kwargs)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogExtendFs

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogExtendFs (args.disk, args.par)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogFindCache

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogFindCache ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogFixBootSector

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogFixBootSector (args.disk, args.par)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogFormat

@@ -22,6 +22,7 @@ else:
     args = parser.parse_args()
     ret = ogFormat (args.disk, args.par, args.fs, args.label)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogFormatCache

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogFormatCache ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogFormatFs

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogFormatFs (args.disk, args.par, args.type, args.label)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetArch

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetArch ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetBootMbr

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGetBootMbr (args.disk)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetCacheSize

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetCacheSize ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetCacheSpace

@@ -7,6 +7,7 @@ from CacheLib import ogGetCacheSpace
 
 ret = ogGetCacheSpace()
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetCaller

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetCaller ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetDiskSize

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGetDiskSize (args.disk)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetDiskType

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGetDiskType (args.dev)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetEsp

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetEsp ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetFreeSize

@@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetFreeSize (args.disk, args.part, args.unit)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetFsSize

@@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetFsSize (args.disk, args.par, args.unit)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetFsType

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetFsType (args.disk, args.part)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetHivePath

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetHivePath (args.mntpt, args.hive)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetHostname

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetHostname ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetImageCompressor

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetImageCompressor (args.container, args.filename)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetImageInfo

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetImageInfo (args.imgfile)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetImageProgram

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetImageProgram (args.container, args.filename)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetImageSize

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetImageSize (args.repo, args.imgname)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetImageType

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetImageType (args.repo, args.imgname)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetIpAddress

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetIpAddress ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetLastSector

@@ -24,6 +24,7 @@ if 2 == len (sys.argv):
 elif 3 == len (sys.argv):
     ret = ogGetLastSector (args.disk, args.par)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetMacAddress

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetMacAddress ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetMountPoint

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetMountPoint (args.disk, args.par)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetOsType

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetOsType (args.disk, args.partition)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetOsUuid

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGetOsUuid (args.disk, args.par)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetOsVersion

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetOsVersion (args.disk, args.part)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetParentPath

@@ -26,6 +26,7 @@ if 3 == len (sys.argv):
 elif 4 == len (sys.argv):
     ret = ogGetParentPath (src=f'{args.disk} {args.par}', file=args.file)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetPartitionActive

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetPartitionActive (args.disk)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetPartitionId

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetPartitionId (args.disk, args.par)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetPartitionSize

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetPartitionSize (args.disk, args.par)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetPartitionTableType

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetPartitionTableType (args.disk)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetPartitionType

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGetPartitionType (args.disk, args.par)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetPartitionsNumber

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGetPartitionsNumber (args.disk)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetPath

@@ -30,6 +30,7 @@ elif 3 == len (sys.argv):
 elif 4 == len (sys.argv):
     ret = ogGetPath (src=f'{args.disk} {args.par}', file=args.file)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetRegistryValue

@@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetRegistryValue (args.mntpt, args.hive, args.k)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetRepoIp

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetRepoIp ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetSerialNumber

@@ -11,6 +11,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 
 ret = ogGetSerialNumber()
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetServerIp

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGetServerIp ()
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGetWindowsName

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGetWindowsName (args.disk, args.par)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGrub4dosInstallMbr

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGrub4dosInstallMbr (args.disk, args.par)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGrubAddOgLive

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGrubAddOgLive (args.disk, args.par, args.timeout, args.offline)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGrubDefaultEntry

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGrubDefaultEntry (args.disk, args.par, args.diskdefault, args.pardefault)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGrubDeleteEntry

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGrubDeleteEntry (args.disk, args.par, args.diskdel, args.pardel)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGrubHidePartitions

@@ -27,6 +27,7 @@ if 3  == len (sys.argv):
 elif 5  == len (sys.argv):
     ret = ogGrubHidePartitions (args.disk, args.par, args.datadisk, args.datapar)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGrubInstallMbr

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGrubInstallMbr (args.disk, args.par, args.checkos, args.kernelparam)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGrubInstallPartition

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogGrubInstallPartition (args.disk, args.par, args.checkos, args.kernelparam)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGrubOgliveDefaultEntry

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGrubOgliveDefaultEntry (args.disk, args.par)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGrubSecurity

@@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGrubSecurity (args.disk, args.par, args.user, args.passwd)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogGrubSetTimeOut

@@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogGrubSetTimeOut (args.disk, args.par, args.timeout)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogHelp

@@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 
 ret = ogHelp (args.fname, args.fmt, args.examples)
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogHidePartition

@@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogHidePartition (args.disk, args.par)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)

ogclient/functions/ogIdToType

@@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]:
 args = parser.parse_args()
 ret = ogIdToType (args.id)
 
+if ret is None: sys.exit (1)
 if ret is not None:
     if   ret == True: sys.exit (0)
     elif ret == False: sys.exit (1)