From c8e76614ae140a0cde301cb01516bdd22eac1689 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 31 Jan 2025 17:36:14 +0100 Subject: [PATCH] refs #1429 add ogGetSerialNumber --- client/lib/engine/bin/InventoryLib.py | 12 ++---------- client/shared/functions/ogGetSerialNumber | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) create mode 100755 client/shared/functions/ogGetSerialNumber diff --git a/client/lib/engine/bin/InventoryLib.py b/client/lib/engine/bin/InventoryLib.py index 4ff5d40..a708b3d 100755 --- a/client/lib/engine/bin/InventoryLib.py +++ b/client/lib/engine/bin/InventoryLib.py @@ -102,20 +102,12 @@ def ogGetOsUuid(): #@brief Obtiene el nº de serie del cliente. #*/ ## def ogGetSerialNumber(): - # Si se solicita, mostrar ayuda. - if len(sys.argv) > 1 and sys.argv[1] == "help": - SystemLib.ogHelp(sys.argv[0], sys.argv[0], sys.argv[0] + " => 123456") - return - - # Obtener nº de serie (ignorar los no especificados). SERIALNO = subprocess.check_output(["dmidecode", "-s", "system-serial-number"]).decode().strip() SERIALNO = re.sub(r"(not specified|to be filled|invalid entry|default string)", "", SERIALNO, flags=re.IGNORECASE) SERIALNO = SERIALNO.replace(" ", "") SERIALNO = SERIALNO[:25] if len(SERIALNO) > 25 else SERIALNO - if SERIALNO: - print(SERIALNO) - - return 0 + if SERIALNO: return SERIALNO + return None #/** diff --git a/client/shared/functions/ogGetSerialNumber b/client/shared/functions/ogGetSerialNumber new file mode 100755 index 0000000..dc02c8e --- /dev/null +++ b/client/shared/functions/ogGetSerialNumber @@ -0,0 +1,17 @@ +#!/usr/bin/python3 + +import sys +from SystemLib import ogHelp +from InventoryLib import ogGetSerialNumber + +if 2 == len (sys.argv) and 'help' == sys.argv[1]: + #parser.print_help() sale en inglés aunque la locale indique otra cosa + ogHelp ('ogGetSerialNumber', 'ogGetSerialNumber', ['ogGetSerialNumber']) + sys.exit (0) + +ret = ogGetSerialNumber() + +if ret is not None: + if ret == True: sys.exit (0) + elif ret == False: sys.exit (1) + else: print (ret)