summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/leap_cli/remote/tasks.rb4
-rw-r--r--vendor/supply_drop/lib/supply_drop/plugin.rb9
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/leap_cli/remote/tasks.rb b/lib/leap_cli/remote/tasks.rb
index 1b15f6b..9e89dba 100644
--- a/lib/leap_cli/remote/tasks.rb
+++ b/lib/leap_cli/remote/tasks.rb
@@ -14,8 +14,8 @@ end
task :install_prerequisites, :max_hosts => MAX_HOSTS do
run "mkdir -p #{puppet_destination}"
- run "#{sudo} apt-get update"
- run "#{sudo} apt-get install -y puppet ruby-hiera-puppet rsync"
+ run "apt-get update"
+ run "apt-get install -y puppet ruby-hiera-puppet rsync"
end
#task :update_platform, :max_hosts => MAX_HOSTS do
diff --git a/vendor/supply_drop/lib/supply_drop/plugin.rb b/vendor/supply_drop/lib/supply_drop/plugin.rb
index 348b22b..1784d59 100644
--- a/vendor/supply_drop/lib/supply_drop/plugin.rb
+++ b/vendor/supply_drop/lib/supply_drop/plugin.rb
@@ -20,8 +20,8 @@ module SupplyDrop
end
def prepare
- run "mkdir -p #{puppet_destination}"
- run "#{sudo} chown -R $USER: #{puppet_destination}"
+ #run "mkdir -p #{puppet_destination}"
+ #run "#{sudo} chown -R $USER: #{puppet_destination}"
end
def noop
@@ -34,7 +34,7 @@ module SupplyDrop
def lock
if should_lock?
- run <<-GETLOCK
+ cmd = <<-GETLOCK
if [ ! -f #{puppet_lock_file} ]; then
touch #{puppet_lock_file};
else
@@ -42,11 +42,12 @@ else
exit 1;
fi
GETLOCK
+ run cmd.gsub(/\s+/, ' ')
end
end
def unlock
- run "#{sudo} rm -f #{puppet_lock_file}; true" if should_lock?
+ run "rm -f #{puppet_lock_file}; true" if should_lock?
end
private