From e5d1d681d9b8d619e2e235df3a5f6bd84266d966 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 9 Apr 2014 14:17:51 -0700 Subject: [PATCH] Update CHANGELOG --- CHANGELOG.md | 1 + plugins/provisioners/shell/config.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7af4b22e8..144357922 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ BUG FIXES: longer be shown in plaintext in the output. [GH-3203] - guests/linux: SMB mount works with passwords with symbols. [GH-3202] - providers/hyperv: Check for PowerShell features. [GH-3398] + - provisioners/shell: Empty shell scripts don't cause errors. [GH-3423] - synced\_folders/smb: Only set the chmod properly by default on Windows if it isn't already set. [GH-3394] - synced\_folders/smb: Sharing folders with odd characters like parens diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb index dc130d7e3..881b3e4cb 100644 --- a/plugins/provisioners/shell/config.rb +++ b/plugins/provisioners/shell/config.rb @@ -53,7 +53,7 @@ module VagrantPlugins :path => expanded_path) else data = expanded_path.read(16) - if data != nil && !data.valid_encoding? + if data && !data.valid_encoding? errors << I18n.t( "vagrant.provisioners.shell.invalid_encoding", actual: data.encoding.to_s,