Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #258 from mclazarus/master

Don't quote shell escaped values.
  • Loading branch information...
commit 88cdaacc676baa9d1c22db27e07d98132a782646 2 parents faf7b3c + 8fbee31
@ddollar authored
View
2  lib/foreman/export/base.rb
@@ -91,7 +91,7 @@ def clean(filename)
end
def shell_quote(value)
- '"' + Shellwords.escape(value) + '"'
+ Shellwords.escape(value)
end
# deprecated
View
2  spec/foreman/export/upstart_spec.rb
@@ -38,7 +38,7 @@
engine.env['KEY'] = 'd"\|d'
upstart.export
"foobarfoo".should include "bar"
- File.read("/tmp/init/app-alpha-1.conf").should =~ /KEY="d\\"\\\\\\\|d/
+ File.read("/tmp/init/app-alpha-1.conf").should =~ /KEY=d\\"\\\\\\\|d/
end
context "with a formation" do
View
4 spec/resources/export/supervisord/app-alpha-1.conf
@@ -8,7 +8,7 @@ stdout_logfile=/var/log/app/alpha-1.log
stderr_logfile=/var/log/app/alpha-1.error.log
user=app
directory=/tmp/app
-environment=PORT="5000"
+environment=PORT=5000
[program:app-bravo-1]
command=./bravo
autostart=true
@@ -18,7 +18,7 @@ stdout_logfile=/var/log/app/bravo-1.log
stderr_logfile=/var/log/app/bravo-1.error.log
user=app
directory=/tmp/app
-environment=PORT="5100"
+environment=PORT=5100
[group:app]
programs=app-alpha-1,app-bravo-1
View
4 spec/resources/export/supervisord/app-alpha-2.conf
@@ -8,7 +8,7 @@ stdout_logfile=/var/log/app/alpha-1.log
stderr_logfile=/var/log/app/alpha-1.error.log
user=app
directory=/tmp/app
-environment=PORT="5000"
+environment=PORT=5000
[program:app-alpha-2]
command=./alpha
autostart=true
@@ -18,7 +18,7 @@ stdout_logfile=/var/log/app/alpha-2.log
stderr_logfile=/var/log/app/alpha-2.error.log
user=app
directory=/tmp/app
-environment=PORT="5001"
+environment=PORT=5001
[group:app]
programs=app-alpha-1,app-alpha-2
Please sign in to comment.
Something went wrong with that request. Please try again.