From 07dad25ec4a2b692711b773a40f8b77dde48bbda Mon Sep 17 00:00:00 2001
From: Bruno Tavares <bruno.exz@gmail.com>
Date: Thu, 6 Mar 2014 19:28:53 -0300
Subject: [PATCH] Make kickstart.user.exec work on clients using module

The kickstart.user.exec function was using the `kickstart infect`
command, which works on clients with kickstart installed (which is the
    case for `kickstart infect`ed terminals or baseline).
This change will lookup for the client existance and use it, or use the
compiled module.
---
 kickstart/recipes/kickstart/user.sh | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/kickstart/recipes/kickstart/user.sh b/kickstart/recipes/kickstart/user.sh
index 84a1311..bcf3239 100644
--- a/kickstart/recipes/kickstart/user.sh
+++ b/kickstart/recipes/kickstart/user.sh
@@ -18,15 +18,32 @@ kickstart.user.remove_group() {
     usermod -G `kickstart.print_with_separator , ${groups[*]}` $1
 }
 
+kickstart.user.exec.command.module() {
+  local cur_dir=`pwd`
+  cat <<COMMAND
+  cd modules/kickstart
+  source install.sh
+  cd $cur_dir
+  $@
+COMMAND
+}
+
+kickstart.user.exec.command.infect() {
+  cat <<COMMAND
+  eval "$(kickstart infect)"
+  $@
+COMMAND
+}
+
 kickstart.user.exec() {
   local user=$1
   shift
 
-  local command=$(cat <<COMMAND
-  eval "$(kickstart infect)"
-  $@
-COMMAND
-)
-  kickstart.info "Running \"$@\" as $user"
+  local command=''
+  kickstart.command_exists kickstart && \
+    command=`kickstart.user.exec.command.infect "$@"` || \
+    command=`kickstart.user.exec.command.module "$@"`
+
+  kickstart.info Running \'"$@"\' as $user
   su $user - bash -c "$command"
 }