From 224663d0c8a86f0aa92f421c212170135b4e141f Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 29 Oct 2021 13:50:04 -0400
Subject: [PATCH] Fix execution of confluent functions after run_remote_python

---
 confluent_osdeploy/el7/profiles/default/scripts/functions        | 1 +
 .../el8-diskless/profiles/default/scripts/functions              | 1 +
 confluent_osdeploy/el8/profiles/default/scripts/functions        | 1 +
 confluent_osdeploy/genesis/profiles/default/scripts/functions    | 1 +
 .../suse15-diskless/profiles/default/scripts/functions           | 1 +
 confluent_osdeploy/suse15/profiles/hpc/scripts/functions         | 1 +
 .../ubuntu20.04/profiles/default/scripts/functions               | 1 +
 7 files changed, 7 insertions(+)

diff --git a/confluent_osdeploy/el7/profiles/default/scripts/functions b/confluent_osdeploy/el7/profiles/default/scripts/functions
index 2eaf5edb..d70c63db 100644
--- a/confluent_osdeploy/el7/profiles/default/scripts/functions
+++ b/confluent_osdeploy/el7/profiles/default/scripts/functions
@@ -172,6 +172,7 @@ run_remote_python() {
     echo "'$*' exited with code $retcode"
     cd - > /dev/null
     rm -rf $confluentscripttmpdir
+    unset confluentscripttmpdir
     return $retcode
 }
 
diff --git a/confluent_osdeploy/el8-diskless/profiles/default/scripts/functions b/confluent_osdeploy/el8-diskless/profiles/default/scripts/functions
index 2eaf5edb..d70c63db 100644
--- a/confluent_osdeploy/el8-diskless/profiles/default/scripts/functions
+++ b/confluent_osdeploy/el8-diskless/profiles/default/scripts/functions
@@ -172,6 +172,7 @@ run_remote_python() {
     echo "'$*' exited with code $retcode"
     cd - > /dev/null
     rm -rf $confluentscripttmpdir
+    unset confluentscripttmpdir
     return $retcode
 }
 
diff --git a/confluent_osdeploy/el8/profiles/default/scripts/functions b/confluent_osdeploy/el8/profiles/default/scripts/functions
index 2eaf5edb..d70c63db 100644
--- a/confluent_osdeploy/el8/profiles/default/scripts/functions
+++ b/confluent_osdeploy/el8/profiles/default/scripts/functions
@@ -172,6 +172,7 @@ run_remote_python() {
     echo "'$*' exited with code $retcode"
     cd - > /dev/null
     rm -rf $confluentscripttmpdir
+    unset confluentscripttmpdir
     return $retcode
 }
 
diff --git a/confluent_osdeploy/genesis/profiles/default/scripts/functions b/confluent_osdeploy/genesis/profiles/default/scripts/functions
index 2eaf5edb..d70c63db 100644
--- a/confluent_osdeploy/genesis/profiles/default/scripts/functions
+++ b/confluent_osdeploy/genesis/profiles/default/scripts/functions
@@ -172,6 +172,7 @@ run_remote_python() {
     echo "'$*' exited with code $retcode"
     cd - > /dev/null
     rm -rf $confluentscripttmpdir
+    unset confluentscripttmpdir
     return $retcode
 }
 
diff --git a/confluent_osdeploy/suse15-diskless/profiles/default/scripts/functions b/confluent_osdeploy/suse15-diskless/profiles/default/scripts/functions
index 2eaf5edb..d70c63db 100644
--- a/confluent_osdeploy/suse15-diskless/profiles/default/scripts/functions
+++ b/confluent_osdeploy/suse15-diskless/profiles/default/scripts/functions
@@ -172,6 +172,7 @@ run_remote_python() {
     echo "'$*' exited with code $retcode"
     cd - > /dev/null
     rm -rf $confluentscripttmpdir
+    unset confluentscripttmpdir
     return $retcode
 }
 
diff --git a/confluent_osdeploy/suse15/profiles/hpc/scripts/functions b/confluent_osdeploy/suse15/profiles/hpc/scripts/functions
index 2eaf5edb..d70c63db 100644
--- a/confluent_osdeploy/suse15/profiles/hpc/scripts/functions
+++ b/confluent_osdeploy/suse15/profiles/hpc/scripts/functions
@@ -172,6 +172,7 @@ run_remote_python() {
     echo "'$*' exited with code $retcode"
     cd - > /dev/null
     rm -rf $confluentscripttmpdir
+    unset confluentscripttmpdir
     return $retcode
 }
 
diff --git a/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/functions b/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/functions
index 2eaf5edb..d70c63db 100644
--- a/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/functions
+++ b/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/functions
@@ -172,6 +172,7 @@ run_remote_python() {
     echo "'$*' exited with code $retcode"
     cd - > /dev/null
     rm -rf $confluentscripttmpdir
+    unset confluentscripttmpdir
     return $retcode
 }