From b8aa54fb8e1b28ed2e525c7f4199f9360a6813e0 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 21 Aug 2020 17:03:12 -0400 Subject: [PATCH] Make output consistent for shell/python remote exec --- confluent_osdeploy/el7/profiles/default/scripts/functions | 4 +++- confluent_osdeploy/el8/profiles/default/scripts/functions | 4 +++- .../genesis/profiles/default/scripts/functions | 4 +++- confluent_osdeploy/rhvh4/profiles/default/scripts/functions | 4 +++- confluent_osdeploy/suse15/profiles/hpc/scripts/functions | 6 +++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/confluent_osdeploy/el7/profiles/default/scripts/functions b/confluent_osdeploy/el7/profiles/default/scripts/functions index d6506b8b..35f3d832 100644 --- a/confluent_osdeploy/el7/profiles/default/scripts/functions +++ b/confluent_osdeploy/el7/profiles/default/scripts/functions @@ -17,7 +17,9 @@ run_remote() { } run_remote_python() { - echo -n Running python script "'$*'" from https://$mgr/confluent-public/os/$profile/scripts/ + echo + echo '---------------------------------------------------------------------------' + echo Running python script "'$*'" from https://$mgr/confluent-public/os/$profile/scripts/ cd $(mktemp -d) curl -f https://$mgr/confluent-public/os/$profile/scripts/$1 > $1 /usr/libexec/platform-python $* diff --git a/confluent_osdeploy/el8/profiles/default/scripts/functions b/confluent_osdeploy/el8/profiles/default/scripts/functions index d6506b8b..35f3d832 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/functions +++ b/confluent_osdeploy/el8/profiles/default/scripts/functions @@ -17,7 +17,9 @@ run_remote() { } run_remote_python() { - echo -n Running python script "'$*'" from https://$mgr/confluent-public/os/$profile/scripts/ + echo + echo '---------------------------------------------------------------------------' + echo Running python script "'$*'" from https://$mgr/confluent-public/os/$profile/scripts/ cd $(mktemp -d) curl -f https://$mgr/confluent-public/os/$profile/scripts/$1 > $1 /usr/libexec/platform-python $* diff --git a/confluent_osdeploy/genesis/profiles/default/scripts/functions b/confluent_osdeploy/genesis/profiles/default/scripts/functions index d6506b8b..35f3d832 100644 --- a/confluent_osdeploy/genesis/profiles/default/scripts/functions +++ b/confluent_osdeploy/genesis/profiles/default/scripts/functions @@ -17,7 +17,9 @@ run_remote() { } run_remote_python() { - echo -n Running python script "'$*'" from https://$mgr/confluent-public/os/$profile/scripts/ + echo + echo '---------------------------------------------------------------------------' + echo Running python script "'$*'" from https://$mgr/confluent-public/os/$profile/scripts/ cd $(mktemp -d) curl -f https://$mgr/confluent-public/os/$profile/scripts/$1 > $1 /usr/libexec/platform-python $* diff --git a/confluent_osdeploy/rhvh4/profiles/default/scripts/functions b/confluent_osdeploy/rhvh4/profiles/default/scripts/functions index d6506b8b..35f3d832 100644 --- a/confluent_osdeploy/rhvh4/profiles/default/scripts/functions +++ b/confluent_osdeploy/rhvh4/profiles/default/scripts/functions @@ -17,7 +17,9 @@ run_remote() { } run_remote_python() { - echo -n Running python script "'$*'" from https://$mgr/confluent-public/os/$profile/scripts/ + echo + echo '---------------------------------------------------------------------------' + echo Running python script "'$*'" from https://$mgr/confluent-public/os/$profile/scripts/ cd $(mktemp -d) curl -f https://$mgr/confluent-public/os/$profile/scripts/$1 > $1 /usr/libexec/platform-python $* diff --git a/confluent_osdeploy/suse15/profiles/hpc/scripts/functions b/confluent_osdeploy/suse15/profiles/hpc/scripts/functions index e127e5ff..6a75c097 100644 --- a/confluent_osdeploy/suse15/profiles/hpc/scripts/functions +++ b/confluent_osdeploy/suse15/profiles/hpc/scripts/functions @@ -1,5 +1,7 @@ run_remote() { requestedcmd="'$*'" + echo + echo '---------------------------------------------------------------------------' echo Running $requestedcmd from https://$mgr/confluent-public/os/$profile/scripts/ cd $(mktemp -d) curl -f https://$mgr/confluent-public/os/$profile/scripts/$1 > $1 @@ -12,7 +14,9 @@ run_remote() { } run_remote_python() { - echo -n Running python script "'$*'" from https://$mgr/confluent-public/os/$profile/scripts/ + echo + echo '---------------------------------------------------------------------------' + echo Running python script "'$*'" from https://$mgr/confluent-public/os/$profile/scripts/ cd $(mktemp -d) curl -f https://$mgr/confluent-public/os/$profile/scripts/$1 > $1 python3 $*