From 2d0c77b07381b1e3b1ff5532ef7b9cff6fa5a845 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Mon, 10 Mar 2025 11:40:49 +0100 Subject: [PATCH] Revert "refs #1674 rename files" This reverts commit 20d50900ad1ab01f66eca0fd9dcd55a023d24805. --- ogclient/interfaceAdm/RestaurarImagen | 18 ++---------------- .../{RestaurarImagen.sh => RestaurarImagen.py} | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 18 deletions(-) rename ogclient/interfaceAdm/{RestaurarImagen.sh => RestaurarImagen.py} (51%) diff --git a/ogclient/interfaceAdm/RestaurarImagen b/ogclient/interfaceAdm/RestaurarImagen index efde3af..6f9ae24 100755 --- a/ogclient/interfaceAdm/RestaurarImagen +++ b/ogclient/interfaceAdm/RestaurarImagen @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/bin/bash #_______________________________________________________________________________________________________________________________ # # PARAMETROS RECIBIDOS DESDE EL CLIENTE: @@ -11,19 +11,5 @@ #_______________________________________________________________________________________________________________________________ # Llamar al script de despliegue "deployImage". +deployImage "$4" "$3" "$1" "$2" "$5" "$6" "$7" "$8" || exit $? -import sys -import subprocess - -import ogGlobals - -if __name__ == '__main__': - prog = sys.argv[0] - if len (sys.argv) < 7: - print (f'Usage: {prog} [additional_args...]') - sys.exit (1) - - disk, par, imgname, repo, proto, protoopt, *extra = sys.argv[1:] - - rc = subprocess.run ([f'{ogGlobals.OGSCRIPTS}/deployImage.py', repo, imgname, disk, par, proto, protoopt] + extra).returncode - sys.exit (rc) diff --git a/ogclient/interfaceAdm/RestaurarImagen.sh b/ogclient/interfaceAdm/RestaurarImagen.py similarity index 51% rename from ogclient/interfaceAdm/RestaurarImagen.sh rename to ogclient/interfaceAdm/RestaurarImagen.py index 6f9ae24..efde3af 100755 --- a/ogclient/interfaceAdm/RestaurarImagen.sh +++ b/ogclient/interfaceAdm/RestaurarImagen.py @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/python3 #_______________________________________________________________________________________________________________________________ # # PARAMETROS RECIBIDOS DESDE EL CLIENTE: @@ -11,5 +11,19 @@ #_______________________________________________________________________________________________________________________________ # Llamar al script de despliegue "deployImage". -deployImage "$4" "$3" "$1" "$2" "$5" "$6" "$7" "$8" || exit $? +import sys +import subprocess + +import ogGlobals + +if __name__ == '__main__': + prog = sys.argv[0] + if len (sys.argv) < 7: + print (f'Usage: {prog} [additional_args...]') + sys.exit (1) + + disk, par, imgname, repo, proto, protoopt, *extra = sys.argv[1:] + + rc = subprocess.run ([f'{ogGlobals.OGSCRIPTS}/deployImage.py', repo, imgname, disk, par, proto, protoopt] + extra).returncode + sys.exit (rc)